virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

ffmpeg: fix for-muxer AVCodecContext stuff

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-01 16:24:00 +02:00
parent 0949ff93c0
commit 0949bbc431
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ffmpeg.c
View File

@ -845,6 +845,7 @@ static void do_video_out(AVFormatContext *s,
int ret, format_video_sync; int ret, format_video_sync;
AVPacket pkt; AVPacket pkt;
AVCodecContext *enc = ost->enc_ctx; AVCodecContext *enc = ost->enc_ctx;
AVCodecContext *mux_enc = ost->st->codec;
int nb_frames, i; int nb_frames, i;
double sync_ipts, delta; double sync_ipts, delta;
double duration = 0; double duration = 0;
@ -945,12 +946,12 @@ static void do_video_out(AVFormatContext *s,
/* raw pictures are written as AVPicture structure to /* raw pictures are written as AVPicture structure to
avoid any copies. We support temporarily the older avoid any copies. We support temporarily the older
method. */ method. */
enc->coded_frame->interlaced_frame = in_picture->interlaced_frame; mux_enc->coded_frame->interlaced_frame = in_picture->interlaced_frame;
enc->coded_frame->top_field_first = in_picture->top_field_first; mux_enc->coded_frame->top_field_first = in_picture->top_field_first;
if (enc->coded_frame->interlaced_frame) if (mux_enc->coded_frame->interlaced_frame)
enc->field_order = enc->coded_frame->top_field_first ? AV_FIELD_TB:AV_FIELD_BT; mux_enc->field_order = mux_enc->coded_frame->top_field_first ? AV_FIELD_TB:AV_FIELD_BT;
else else
enc->field_order = AV_FIELD_PROGRESSIVE; mux_enc->field_order = AV_FIELD_PROGRESSIVE;
pkt.data = (uint8_t *)in_picture; pkt.data = (uint8_t *)in_picture;
pkt.size = sizeof(AVPicture); pkt.size = sizeof(AVPicture);
pkt.pts = av_rescale_q(in_picture->pts, enc->time_base, ost->st->time_base); pkt.pts = av_rescale_q(in_picture->pts, enc->time_base, ost->st->time_base);
@ -967,11 +968,11 @@ static void do_video_out(AVFormatContext *s,
if (in_picture->interlaced_frame) { if (in_picture->interlaced_frame) {
if (enc->codec->id == AV_CODEC_ID_MJPEG) if (enc->codec->id == AV_CODEC_ID_MJPEG)
enc->field_order = in_picture->top_field_first ? AV_FIELD_TT:AV_FIELD_BB; mux_enc->field_order = in_picture->top_field_first ? AV_FIELD_TT:AV_FIELD_BB;
else else
enc->field_order = in_picture->top_field_first ? AV_FIELD_TB:AV_FIELD_BT; mux_enc->field_order = in_picture->top_field_first ? AV_FIELD_TB:AV_FIELD_BT;
} else } else
enc->field_order = AV_FIELD_PROGRESSIVE; mux_enc->field_order = AV_FIELD_PROGRESSIVE;
in_picture->quality = enc->global_quality; in_picture->quality = enc->global_quality;
if (!enc->me_threshold) if (!enc->me_threshold)