diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 23:04:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 23:04:05 +0100 |
| commit | 830be99ae1679f852ef3bb7da427579008aa3887 (patch) | |
| tree | acf38b499068047715af17c2d70a7a57ecc80c11 /presets/libvpx-1080p.ffpreset | |
| parent | b58c1dd63268e6805fd3423bdecb8f4530e1cae2 (diff) | |
| parent | 97d19c2fec351093652b9eef8ef030227aec57df (diff) | |
| download | ffmpeg-830be99ae1679f852ef3bb7da427579008aa3887.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dv: Split off DV video encoder into its own file
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libvpx-1080p.ffpreset')
0 files changed, 0 insertions, 0 deletions