[FFmpeg-cvslog] Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'
Michael Niedermayer
git at videolan.org
Sat Apr 19 19:04:08 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 19 18:50:32 2014 +0200| [928b5708f94c50e8cb0b982208a2d097b0d588c2] | committer: Michael Niedermayer
Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'
* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
h264: codec reinit: remove statements without effect
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=928b5708f94c50e8cb0b982208a2d097b0d588c2
---
More information about the ffmpeg-cvslog
mailing list