ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun
Jul 19 11:57:34 2015 +0200| [8534c8c77a509987d6b63ed3b65155c3561b8583] |
committer: Michael Niedermayer
Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'
* commit '56c2f37727015212a404cae0f444d8bc8704d691':
avconv: drop update_sample_fmt()
Conflicts:
ffmpeg.c
No change as the removed code is not in FFmpeg
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8534c8c77a509987d6b63ed3b65155c3561b8583
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
