[FFmpeg-cvslog] Merge commit '0957b274e312e985d69cb490bee2a7ff820acaa6'
Michael Niedermayer
git at videolan.org
Sun Jun 1 13:54:58 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 1 13:46:38 2014 +0200| [03bb99ae1a99fa315621308b885a8fc70702c9bc] | committer: Michael Niedermayer
Merge commit '0957b274e312e985d69cb490bee2a7ff820acaa6'
* commit '0957b274e312e985d69cb490bee2a7ff820acaa6':
lavc: add an option to enable side data-only packets during encoding
Conflicts:
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03bb99ae1a99fa315621308b885a8fc70702c9bc
---
More information about the ffmpeg-cvslog
mailing list