diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:54:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:54:38 +0100 |
| commit | 8ac0d95bd371a3cf6b4dd57a3d56cdc7bceef464 (patch) | |
| tree | 1cbdc131646a523249ebdd373387176c161e5928 /libavcodec/h264.h | |
| parent | 17596198cacbb7277f1d9641f0a76fe62ebf155d (diff) | |
| parent | 940b8b5861241df7aff8977774e1de6e67de5b83 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: avoid pointless copying of ref lists
lavr: always reset mix function names and pointers in mix_function_init()
lavr: call mix_function_init() in ff_audio_mix_set_matrix()
fate: update ref after rv30_loop_filter fix
rv30: fix masking in rv30_loop_filter()
Conflicts:
tests/ref/fate/filter-delogo
tests/ref/fate/rv30
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 4b6a19ed4a..e7ad07db8e 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -485,9 +485,9 @@ typedef struct H264Context { int redundant_pic_count; + Picture default_ref_list[2][32]; ///< base reference list for all slices of a coded picture Picture *short_ref[32]; Picture *long_ref[32]; - Picture default_ref_list[2][32]; ///< base reference list for all slices of a coded picture Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size? int last_pocs[MAX_DELAYED_PIC_COUNT]; Picture *next_output_pic; |