diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 12:40:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 13:01:06 +0200 |
| commit | ba650ea11825fdf7df479313bfca2a1003ffd90e (patch) | |
| tree | fb90677e59bf0fc5dd235a5a53a9b1fcae2a7857 /libavcodec/resample2.c | |
| parent | d5ee74e57d44ccbf644ea76d635628ed4e5fabfb (diff) | |
| parent | a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e (diff) | |
| download | ffmpeg-ba650ea11825fdf7df479313bfca2a1003ffd90e.tar.gz | |
Merge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e'
* commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e':
vc1: Fix the skip condition
Conflicts:
libavcodec/vc1_parser.c
See: ede411dd03950b91c6346f2a3ae0e7546555f42f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/resample2.c')
0 files changed, 0 insertions, 0 deletions