diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 13:46:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 13:46:38 +0200 |
| commit | 03bb99ae1a99fa315621308b885a8fc70702c9bc (patch) | |
| tree | d21c922164f5f18348a3e5f060a7ad9b42de8999 /libavcodec/cinepak.c | |
| parent | 0ccfcb0638be99d1fc2c2c1dea6850b3b257ae01 (diff) | |
| parent | 0957b274e312e985d69cb490bee2a7ff820acaa6 (diff) | |
| download | ffmpeg-03bb99ae1a99fa315621308b885a8fc70702c9bc.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec/cinepak.c')
0 files changed, 0 insertions, 0 deletions