ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jan 27
16:17:42 2015 +0100| [be023405a7cdbdd6b5d163de8beb1968ee4ef52e] | committer:
Michael Niedermayer
Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'
* commit 'f771b3ab5d3c0b763ee356152be550f4121babd0':
avidec: do not export stream_codec_tag
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be023405a7cdbdd6b5d163de8beb1968ee4ef52e
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
