diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:14:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:14:41 +0100 |
| commit | b71e4d8717450e6d6d08125fbd24a74f082dff71 (patch) | |
| tree | eff948420644b739d148170772592a9e6874c63f /libavcodec/siprdata.h | |
| parent | 31c09b7663acdcc64031d6f251a667ce812f590f (diff) | |
| parent | 8941971a8f2e24b9a84fe29f128d13ceb89c0a65 (diff) | |
| download | ffmpeg-b71e4d8717450e6d6d08125fbd24a74f082dff71.tar.gz | |
Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'
* commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65':
lavc: make error_rate a private option of mpegvideo encoders
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/siprdata.h')
0 files changed, 0 insertions, 0 deletions