aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-03 03:06:43 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-20 02:25:54 +0100
commit82db2f2ac8c3aaf731e50f584646798edf73f378 (patch)
tree9f811c6da56512bf1eb49fb74efe234929dc2e5a
parentf36b3c5df97da465757563b7e14c90a9f9e7537e (diff)
downloadffmpeg-82db2f2ac8c3aaf731e50f584646798edf73f378.tar.gz
ffmpeg: drop usage of coded_frame
It causes all kinds of problems and there is no code in the muxers that reads this field Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 242f1152bf906a4a3164a9a8e40bd52723bd5afe) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index ee8039cce8..ffcb9dd92e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -978,10 +978,8 @@ static void do_video_out(AVFormatContext *s,
/* raw pictures are written as AVPicture structure to
avoid any copies. We support temporarily the older
method. */
- mux_enc->coded_frame->interlaced_frame = in_picture->interlaced_frame;
- mux_enc->coded_frame->top_field_first = in_picture->top_field_first;
- if (mux_enc->coded_frame->interlaced_frame)
- mux_enc->field_order = mux_enc->coded_frame->top_field_first ? AV_FIELD_TB:AV_FIELD_BT;
+ if (in_picture->interlaced_frame)
+ mux_enc->field_order = in_picture->top_field_first ? AV_FIELD_TB:AV_FIELD_BT;
else
mux_enc->field_order = AV_FIELD_PROGRESSIVE;
pkt.data = (uint8_t *)in_picture;