[FFmpeg-cvslog] Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1'

Michael Niedermayer git at videolan.org
Wed Aug 21 13:09:00 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 21 13:03:40 2013 +0200| [70a73213b787268b9fdfc92ed418ad9802992b10] | committer: Michael Niedermayer

Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1'

* commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1':
  h264_ps: Use more meaningful error values

Conflicts:
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70a73213b787268b9fdfc92ed418ad9802992b10
---





More information about the ffmpeg-cvslog mailing list