aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorRoman Shaposhnik <roman@shaposhnik.org>2003-10-18 03:19:44 +0000
committerRoman Shaposhnik <roman@shaposhnik.org>2003-10-18 03:19:44 +0000
commit2744ca9ac919d63fb8a5948c21d2e943cdd04e3d (patch)
treeb5f7a6640f9ab5b09d059569e47714f1b932c08d /ffmpeg.c
parenta573cc27f51ad93d8453bbe1d06f0e59ba49f838 (diff)
downloadffmpeg-2744ca9ac919d63fb8a5948c21d2e943cdd04e3d.tar.gz
* providing MPEG codecs with a generic fields in AVFrame to use.
* fixing YUV4MPEG format. * fixing a bug in DV codec where coded_frame was not set. Originally committed as revision 2396 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index c5239d4a46..a160e8abd7 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -608,8 +608,11 @@ static void do_video_out(AVFormatContext *s,
/* raw pictures are written as AVPicture structure to
avoid any copies. We support temorarily the older
method. */
+ AVFrame* old_frame = enc->coded_frame;
+ enc->coded_frame = dec->coded_frame;
av_write_frame(s, ost->index,
(uint8_t *)final_picture, sizeof(AVPicture));
+ enc->coded_frame = old_frame;
} else {
AVFrame big_picture;