ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jan 27
17:05:59 2015 +0100| [3c831fba08698293034db5ecaf8d74aa5fe453f8] | committer:
Michael Niedermayer
Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'
* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9':
lavc: deprecate unused AVCodecContext.stream_codec_tag
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c831fba08698293034db5ecaf8d74aa5fe453f8
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
