[FFmpeg-cvslog] Merge commit 'edaba18021e4793116f0f266e65077578a5e742e'

Michael Niedermayer git at videolan.org
Tue Sep 24 15:36:11 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 24 15:23:01 2013 +0200| [af2bb83dffb7a2be00a155aeba24a3312c1fb94e] | committer: Michael Niedermayer

Merge commit 'edaba18021e4793116f0f266e65077578a5e742e'

* commit 'edaba18021e4793116f0f266e65077578a5e742e':
  h264: log extradata skip only for non-ignored NALs

Conflicts:
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list