[FFmpeg-cvslog] Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'
Michael Niedermayer
git at videolan.org
Fri Oct 17 21:21:33 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 17 21:00:08 2014 +0200| [0b0d47e4b21e8936707183967d840f64ba055cb2] | committer: Michael Niedermayer
Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'
* commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4':
dump: display codec tags when available
Conflicts:
libavcodec/utils.c
See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b0d47e4b21e8936707183967d840f64ba055cb2
---
More information about the ffmpeg-cvslog
mailing list