diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 14:06:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 14:06:15 +0200 |
| commit | ec8f56efad2c1a150e822f6b11c54915446a2d09 (patch) | |
| tree | cdca1d57f0be58bd8dcb922344d9fc7559151c62 /libswresample/x86/Makefile | |
| parent | 17a065cf204fb626b6940b1bc3df5d6ab9f4a468 (diff) | |
| parent | a75c2eb25a62105c09b48521aef429dc8a231637 (diff) | |
| download | ffmpeg-ec8f56efad2c1a150e822f6b11c54915446a2d09.tar.gz | |
Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'
* commit 'a75c2eb25a62105c09b48521aef429dc8a231637':
lavc: make rc_eq into private options of mpegvideo encoders
Conflicts:
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86/Makefile')
0 files changed, 0 insertions, 0 deletions