summaryrefslogtreecommitdiffstats
path: root/avconv.c
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2011-12-13 18:49:06 -0800
committerAlex Converse <alex.converse@gmail.com>2011-12-21 22:04:37 -0800
commit4bf3c8f226252e18de8051fd0d417c1d39857b67 (patch)
treef2b1bccb16202512c24bc080a683a092c8c4174f /avconv.c
parentf264d336fe61c12ce9607c3060aa5d3dca947c61 (diff)
downloadffmpeg-streaming-4bf3c8f226252e18de8051fd0d417c1d39857b67.zip
ffmpeg-streaming-4bf3c8f226252e18de8051fd0d417c1d39857b67.tar.gz
mov: Don't stick the QuickTime field ordering atom in extradata.
The 'fiel' atoms can be found in H.264 tracks clobbering the extradata. MJPEG supports non field based extradata, and this data should be preserved when copying.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/avconv.c b/avconv.c
index ecbf523..dfef98f 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2070,6 +2070,7 @@ static int transcode_init(OutputFile *output_files,
codec->bit_rate = icodec->bit_rate;
codec->rc_max_rate = icodec->rc_max_rate;
codec->rc_buffer_size = icodec->rc_buffer_size;
+ codec->field_order = icodec->field_order;
codec->extradata = av_mallocz(extra_size);
if (!codec->extradata) {
return AVERROR(ENOMEM);
OpenPOWER on IntegriCloud