mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-29 20:56:12 +02:00
Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'
* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f': flv: K&R formatting cosmetics Conflicts: libavcodec/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3ea5beab8f
@ -22,7 +22,8 @@
|
||||
#include "flv.h"
|
||||
#include "libavutil/imgutils.h"
|
||||
|
||||
void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last){
|
||||
void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last)
|
||||
{
|
||||
int is11 = get_bits1(gb);
|
||||
*last = get_bits1(gb);
|
||||
*run = get_bits(gb, 6);
|
||||
@ -104,6 +105,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
|
||||
/* PEI */
|
||||
if (skip_1stop_8data_bits(&s->gb) < 0)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
s->f_code = 1;
|
||||
|
||||
if (s->ehc_mode)
|
||||
@ -115,8 +117,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
|
||||
s->h263_flv - 1, s->qscale, s->picture_number);
|
||||
}
|
||||
|
||||
s->y_dc_scale_table=
|
||||
s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
|
||||
s->y_dc_scale_table = s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user