diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 12:18:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 12:21:41 +0200 |
| commit | e1f4397e74f0a21c10e74eabb87f6fe601d6791f (patch) | |
| tree | 2aa97f24f6f7c25c28ff4eb6fb1cf901106299ab /libavcodec/hevc_refs.c | |
| parent | aa56c37c8ac53ddc4ee828406b2185bf20a1e5c7 (diff) | |
| parent | 458e7c94830d1522997e33a0b5e87bd709e8a349 (diff) | |
| download | ffmpeg-streaming-e1f4397e74f0a21c10e74eabb87f6fe601d6791f.zip ffmpeg-streaming-e1f4397e74f0a21c10e74eabb87f6fe601d6791f.tar.gz | |
Merge commit '458e7c94830d1522997e33a0b5e87bd709e8a349'
* commit '458e7c94830d1522997e33a0b5e87bd709e8a349':
hevc: implement pic_output_flag handling
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_refs.c
See: 2eddf3a6efd80aa6e9d7f42ad9a892a82c5ece70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_refs.c')
| -rw-r--r-- | libavcodec/hevc_refs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 24d55d1..136cc6f 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -144,10 +144,12 @@ int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc) *frame = ref->frame; s->ref = ref; + if (s->sh.pic_output_flag) + ref->flags = HEVC_FRAME_FLAG_OUTPUT | HEVC_FRAME_FLAG_SHORT_REF; + else + ref->flags = HEVC_FRAME_FLAG_SHORT_REF; + ref->poc = poc; - ref->flags = HEVC_FRAME_FLAG_OUTPUT | HEVC_FRAME_FLAG_SHORT_REF; - if (s->sh.pic_output_flag == 0) - ref->flags &= ~(HEVC_FRAME_FLAG_OUTPUT); ref->sequence = s->seq_decode; ref->window = s->sps->output_window; |
