[FFmpeg-cvslog] Merge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'

Michael Niedermayer git at videolan.org
Thu May 1 18:05:40 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 18:00:27 2014 +0200| [d1c359777f3ebccb7565043cd79347ab305758d8] | committer: Michael Niedermayer

Merge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'

* commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137':
  lavc: do not use AVCodecContext.codec_name in avcodec_string()

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=d1c359777f3ebccb7565043cd79347ab305758d8
---





More information about the ffmpeg-cvslog mailing list