aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_refs.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-25 11:33:51 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-25 11:33:51 +0100
commited25ca16617121b382a961980707844fafcf82f8 (patch)
treeea582f538fe589342d6f861a164901627fd68941 /libavcodec/h264_refs.c
parentbcccb2c2986bca9307b66a8d681addad54c786ff (diff)
parentb67138598ce158e3083f6295a27b63e2065d5ecb (diff)
downloadffmpeg-ed25ca16617121b382a961980707844fafcf82f8.tar.gz
Merge commit 'b67138598ce158e3083f6295a27b63e2065d5ecb'
* commit 'b67138598ce158e3083f6295a27b63e2065d5ecb': vc1: Simplify a little setting the intra variables Conflicts: libavcodec/vc1_block.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_refs.c')
0 files changed, 0 insertions, 0 deletions