summaryrefslogtreecommitdiffstats
path: root/libavfilter/libmpcodecs/vf_uspp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2014-04-27 13:29:24 +0200
committerMichael Niedermayer <[email protected]>2014-04-27 13:29:28 +0200
commit7e7b668ef50cc85d98a772b8fb3b96a26950b80f (patch)
tree34ce9c3ff0c03d2f3f255204bfed46e7269a2edc /libavfilter/libmpcodecs/vf_uspp.c
parente20ebe491c17388a312e04ff060c217ecfafc914 (diff)
parentade5851be085d392cc7490d4cf64c6fe4ac6ae6a (diff)
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags. Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/libmpcodecs/vf_uspp.c')
0 files changed, 0 insertions, 0 deletions