[FFmpeg-cvslog] Merge commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6'
Michael Niedermayer
git at videolan.org
Tue Sep 24 15:43:48 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 24 15:38:08 2013 +0200| [d195e6e410e4d8220a7751765c71ec111f89597f] | committer: Michael Niedermayer
Merge commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6'
* commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6':
h264: do not discard NAL_SEI when skipping frames
Conflicts:
libavcodec/h264.c
See: 7d75fb381ba774a8d2fa7de0c12140cd465c0255
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d195e6e410e4d8220a7751765c71ec111f89597f
---
More information about the ffmpeg-cvslog
mailing list