diff options
author | Michael Niedermayer <[email protected]> | 2014-04-27 13:29:24 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2014-04-27 13:29:28 +0200 |
commit | 7e7b668ef50cc85d98a772b8fb3b96a26950b80f (patch) | |
tree | 34ce9c3ff0c03d2f3f255204bfed46e7269a2edc /libavfilter/libmpcodecs/mp_image.c | |
parent | e20ebe491c17388a312e04ff060c217ecfafc914 (diff) | |
parent | ade5851be085d392cc7490d4cf64c6fe4ac6ae6a (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/mp_image.c')
0 files changed, 0 insertions, 0 deletions