[FFmpeg-cvslog] ffmpeg: drop usage of coded_frame
Michael Niedermayer
git at videolan.org
Sat Dec 20 02:47:09 CET 2014
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 3 03:06:43 2014 +0100| [82db2f2ac8c3aaf731e50f584646798edf73f378] | committer: Michael Niedermayer
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 at gmx.at>
(cherry picked from commit 242f1152bf906a4a3164a9a8e40bd52723bd5afe)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82db2f2ac8c3aaf731e50f584646798edf73f378
---
ffmpeg.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index ee8039c..ffcb9dd 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;
More information about the ffmpeg-cvslog
mailing list