diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 11:57:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 12:00:11 +0100 |
| commit | 79f77ce31c6cbe2c8c1163862acdaf2014a85458 (patch) | |
| tree | d7ef6356eecaad48d6fec72e311b809768b7d923 /libavcodec/h264_refs.c | |
| parent | ed25ca16617121b382a961980707844fafcf82f8 (diff) | |
| parent | d25afb579facc83fd3a839f21411124d0b09f0ba (diff) | |
| download | ffmpeg-79f77ce31c6cbe2c8c1163862acdaf2014a85458.tar.gz | |
Merge commit 'd25afb579facc83fd3a839f21411124d0b09f0ba'
* commit 'd25afb579facc83fd3a839f21411124d0b09f0ba':
vc1: Set the is_intra bitfield to all 1 when needed
Conflicts:
libavcodec/vc1_block.c
See: 04152a31cb41a7ca3cc0bde9d962454fc30bab9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_refs.c')
0 files changed, 0 insertions, 0 deletions