diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-27 11:52:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-27 11:59:39 +0200 |
| commit | 6999f8bcf56bb167124bf85bdaa89090acdd5d9c (patch) | |
| tree | 5bfb541bec48db787901f2441bd887d3629737ea /libavcodec/vc1data.c | |
| parent | ab31db06103c6ac0c1bd1f9fdfa93220d8801e19 (diff) | |
| parent | 904100e5fc13dacc954b1d093bf87bc44f4e7a7b (diff) | |
| download | ffmpeg-6999f8bcf56bb167124bf85bdaa89090acdd5d9c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
make av_interleaved_write_frame() flush packets when pkt is NULL
mpegts: Fix dead error checks
vc1: Do not read from array if index is invalid.
targa: convert to bytestream2.
rv34: set mb_num_left to 0 after finishing a frame
Conflicts:
libavcodec/targa.c
libavcodec/vc1data.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1data.c')
| -rw-r--r-- | libavcodec/vc1data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1data.c b/libavcodec/vc1data.c index bfc8a22fc0..fc9ba6da13 100644 --- a/libavcodec/vc1data.c +++ b/libavcodec/vc1data.c @@ -84,7 +84,7 @@ const uint8_t ff_vc1_mbmode_intfrp[2][15][4] = { } }; -const int ff_vc1_fps_nr[7] = { 24, 25, 30, 50, 60, 48, 72}, +const int ff_vc1_fps_nr[7] = { 24, 25, 30, 50, 60, 48, 72 }, ff_vc1_fps_dr[2] = { 1000, 1001 }; const uint8_t ff_vc1_pquant_table[3][32] = { /* Implicit quantizer */ |