summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2002-10-14 17:53:02 +0000
committerFabrice Bellard <fabrice@bellard.org>2002-10-14 17:53:02 +0000
commit7002684e69145236e2ee4e4156312430ae70eeb8 (patch)
tree6795bf71721fa6b73a7f1daf8b088ce94ab05aa9 /ffmpeg.c
parent487a54d71daf338e93281758510dffce051842c1 (diff)
raw picture support in mux
Originally committed as revision 1035 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 260857659e..eaa95b5dd9 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -559,7 +559,15 @@ static void do_video_out(AVFormatContext *s,
fprintf(ost->logfile, "%s", enc->stats_out);
}
} else {
- write_picture(s, ost->index, picture, enc->pix_fmt, enc->width, enc->height);
+ if (s->oformat->flags & AVFMT_RAWPICTURE) {
+ /* raw pictures are written as AVPicture structure to
+ avoid any copies. We support temorarily the older
+ method. */
+ s->oformat->write_packet(s, ost->index,
+ (UINT8 *)picture, sizeof(AVPicture), 0);
+ } else {
+ write_picture(s, ost->index, picture, enc->pix_fmt, enc->width, enc->height);
+ }
}
}
the_end: