aboutsummaryrefslogtreecommitdiffstats
path: root/presets/libvpx-1080p.ffpreset
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-31 21:27:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-31 21:27:42 +0200
commit5afdb3e6b1a06a897ec6d4fe5da1619ae8bef6be (patch)
tree1aad51e15c06538510f1597af7e05bbedbcc94e1 /presets/libvpx-1080p.ffpreset
parentb7d14883939e756cbda376c66552be9d843910a0 (diff)
parent0fcf3013c4aa4f70c39899b7b3bd8c451fe2e493 (diff)
downloadffmpeg-5afdb3e6b1a06a897ec6d4fe5da1619ae8bef6be.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines http: Pass the proper return code of net IO operations http: Add 'post_data', a new option which sets custom HTTP post data lavfi: amix: check active input count before calling request_samples vp8: move block coeff arithcoder on stack. mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3. Conflicts: libavformat/ac3dec.c libavformat/mp3dec.c tests/fate/ac3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libvpx-1080p.ffpreset')
0 files changed, 0 insertions, 0 deletions