RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avconv: Replace raw picture frame swapping hack.

This commit is contained in:
Alex Converse 2011-08-29 19:28:42 -07:00
parent a80852316e
commit f593628e58
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
avconv.c
View File

@ -1098,11 +1098,10 @@ static void do_video_out(AVFormatContext *s,
{ {
int nb_frames, i, ret, format_video_sync; int nb_frames, i, ret, format_video_sync;
AVFrame *final_picture; AVFrame *final_picture;
AVCodecContext *enc, *dec; AVCodecContext *enc;
double sync_ipts; double sync_ipts;
enc = ost->st->codec; enc = ost->st->codec;
dec = ist->st->codec;
sync_ipts = get_sync_ipts(ost) / av_q2d(enc->time_base); sync_ipts = get_sync_ipts(ost) / av_q2d(enc->time_base);
@ -1156,15 +1155,14 @@ 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. */
AVFrame* old_frame = enc->coded_frame; enc->coded_frame->interlaced_frame = in_picture->interlaced_frame;
enc->coded_frame = dec->coded_frame; //FIXME/XXX remove this hack enc->coded_frame->top_field_first = in_picture->top_field_first;
pkt.data= (uint8_t *)final_picture; pkt.data= (uint8_t *)final_picture;
pkt.size= sizeof(AVPicture); pkt.size= sizeof(AVPicture);
pkt.pts= av_rescale_q(ost->sync_opts, enc->time_base, ost->st->time_base); pkt.pts= av_rescale_q(ost->sync_opts, enc->time_base, ost->st->time_base);
pkt.flags |= AV_PKT_FLAG_KEY; pkt.flags |= AV_PKT_FLAG_KEY;
write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters); write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters);
enc->coded_frame = old_frame;
} else { } else {
AVFrame big_picture; AVFrame big_picture;