aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorJoakim Plate <elupus@ecce.se>2013-06-27 23:09:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-21 16:04:02 +0200
commit8710a634a5d422d9ee9d1578ff1c07cd39f16ce0 (patch)
tree3d0d3f2b5d11adcbb4b247b1c4df04323b7a3664 /libavcodec/h264.c
parent0f229f9b91fe3c4ebd97e88f004d638819b76add (diff)
downloadffmpeg-8710a634a5d422d9ee9d1578ff1c07cd39f16ce0.tar.gz
h264: add frame packing as stereo_mode frame metadata
This matches the matroska defintion of stereo_mode, with no metadata written if no info exist in sei Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 6a6a68c050..98d933490c 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1512,6 +1512,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
h->prev_poc_msb = 1 << 16;
h->prev_frame_num = -1;
h->x264_build = -1;
+ h->sei_fpa.frame_packing_arrangement_cancel_flag = -1;
ff_h264_reset_sei(h);
if (avctx->codec_id == AV_CODEC_ID_H264) {
if (avctx->ticks_per_frame == 1) {
@@ -4859,6 +4860,8 @@ static int output_frame(H264Context *h, AVFrame *dst, Picture *srcp)
if (ret < 0)
return ret;
+ av_dict_set(&dst->metadata, "stereo_mode", ff_h264_sei_stereo_mode(h), 0);
+
if (!srcp->crop)
return 0;