[FFmpeg-cvslog] Merge commit '2ea00e35e4e0b58f7a306dd55d8f72a21c32c946'

Michael Niedermayer git at videolan.org
Sat Mar 21 17:09:49 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 17:02:23 2015 +0100| [727b202330712eb981eb008b1e7a936d71092f71] | committer: Michael Niedermayer

Merge commit '2ea00e35e4e0b58f7a306dd55d8f72a21c32c946'

* commit '2ea00e35e4e0b58f7a306dd55d8f72a21c32c946':
  h264: do not abuse the context as a temporary storage in get_last_needed_nal()

Conflicts:
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list