[FFmpeg-cvslog] Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'
Michael Niedermayer
git at videolan.org
Thu May 15 19:31:26 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 15 19:24:19 2014 +0200| [f478e8500a3d1fb0c6014956de42d87e292b9e3b] | committer: Michael Niedermayer
Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'
* commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf':
lavf: drop the zero-sized packets hack
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f478e8500a3d1fb0c6014956de42d87e292b9e3b
---
More information about the ffmpeg-cvslog
mailing list