diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 04:26:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 04:29:59 +0100 |
| commit | a459891e624c7b7670f888498df9c137b6ad6111 (patch) | |
| tree | d4161af5065be35651a8cd15d797dd2d6e128a88 /libavcodec/wmalosslessdec.c | |
| parent | 1c7d2870440fcf3c11dadb8b060cc8ee0ffeafc5 (diff) | |
| parent | dd2d0039b6405dc724e4fef0d5b8f49530eea3aa (diff) | |
| download | ffmpeg-a459891e624c7b7670f888498df9c137b6ad6111.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: Always reset numref when parsing a new frame header.
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmalosslessdec.c')
0 files changed, 0 insertions, 0 deletions