[FFmpeg-cvslog] Merge commit '404a416d4b1fcbf9db5569481d8181f296c01ea9'

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:00:51 2015 +0100| [eba2c2321bc51b0faf5df379e5968ef2aa581cd8] | committer: Michael Niedermayer

Merge commit '404a416d4b1fcbf9db5569481d8181f296c01ea9'

* commit '404a416d4b1fcbf9db5569481d8181f296c01ea9':
  h264: remove some remnants of data partitioning

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_slice.c

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

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





More information about the ffmpeg-cvslog mailing list