generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'

Browse Source 
* commit '9301486408a480629336af4d7fd873c0f28fb2d5':
  avcodec: add stream-level stereo3d side data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-28 22:23:01 +02:00
parent 56cc754c76 9301486408
commit f30a8154ab
5 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/utils.c
View File

@@ -756,6 +756,16 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
memcpy(frame_sd->data, packet_sd, size);
}
/* copy the stereo3d format to the output frame */
packet_sd = av_packet_get_side_data(pkt, AV_PKT_DATA_STEREO3D, &size);
if (packet_sd) {
frame_sd = av_frame_new_side_data(frame, AV_FRAME_DATA_STEREO3D, size);
if (!frame_sd)
return AVERROR(ENOMEM);
memcpy(frame_sd->data, packet_sd, size);
}
} else {
frame->pkt_pts = AV_NOPTS_VALUE;
av_frame_set_pkt_pos (frame, -1);