[FFmpeg-cvslog] Merge commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc' into release/2.4

Michael Niedermayer git at videolan.org
Sat Feb 28 19:14:56 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 28 19:03:35 2015 +0100| [a8eb02da80dfc04fdc75e50db63e45075821c134] | committer: Michael Niedermayer

Merge commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc' into release/2.4

* commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc':
  h264: only ref cur_pic in update_thread_context if it is initialized

Conflicts:
	libavcodec/h264_slice.c

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

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





More information about the ffmpeg-cvslog mailing list