aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/timefilter.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-15 09:57:28 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-15 09:57:28 +0200
commitcb22692f05f916ba521a88e198fa8d15f92c9303 (patch)
tree979d4ab2a6d360e99c3f0dcfb65c20bd2f7da048 /libavdevice/timefilter.c
parentb602e47f12d72b383d986d66212341af31c9bc82 (diff)
parentfe06795d783785a76c6cbcaa2cd3012e6deb5fa5 (diff)
downloadffmpeg-cb22692f05f916ba521a88e198fa8d15f92c9303.tar.gz
Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'
* commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5': vc1: implement frame interlaced b-frame header parsing Conflicts: libavcodec/vc1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/timefilter.c')
0 files changed, 0 insertions, 0 deletions