diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 03:25:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 03:25:29 +0200 |
| commit | 27f77a372b9f5fa5d33c388cd9c3d74b1411d8e3 (patch) | |
| tree | 5abaf8307c5de58a870877d8bdb11aa1cb0f6594 /libavresample | |
| parent | 61b3b3315c465ca7d74d3e95a881470642afddbc (diff) | |
| parent | c61114834018336d39ea4efee705f3dd973f4d15 (diff) | |
| download | ffmpeg-27f77a372b9f5fa5d33c388cd9c3d74b1411d8e3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1dec: fix a possible unitialized variable warning
Conflicts:
libavcodec/vc1dec.c
No change as the variables where not uninitialized in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions