diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 11:41:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 11:41:31 +0100 |
| commit | ec203cd69b57e298e6735e041fb5a2a0c880b44c (patch) | |
| tree | d53b453b87f4add82711a578bc2bc703ae193744 /libavcodec/h264.c | |
| parent | 973dc110ba0ace5ecc57a01b3f6a44d58cd8079c (diff) | |
| parent | e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9 (diff) | |
Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'
* commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9':
h264: do not copy ref count/ref2frm when updating per-frame context
flvdec: Check the return value of a malloc
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 132739f8c8..56f3c47e87 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1644,8 +1644,6 @@ static int decode_update_thread_context(AVCodecContext *dst, copy_fields(h, h1, poc_lsb, redundant_pic_count); // reference lists - copy_fields(h, h1, ref_count, list_count); - copy_fields(h, h1, ref2frm, intra_gb); copy_fields(h, h1, short_ref, cabac_init_idc); copy_picture_range(h->short_ref, h1->short_ref, 32, h, h1); |