avconv: get output pixel format from lavfi.

[ffmpeg] / libavformat / rawvideodec.c

diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c
index f8d9b65f36a031181038d998943013942fac3502..c27cd7c5dbf87d2d749fbb3d4449024c6d3e7964 100644 (file)
--- a/libavformat/rawvideodec.c
+++ b/libavformat/rawvideodec.c
@@ -44,15 +44,30 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
+#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
+#define DEC AV_OPT_FLAG_DECODING_PARAM
+static const AVOption rawvideo_options[] = {
+    { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
+    { "pixel_format", "", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = "yuv420p"}, 0, 0, DEC },
+    { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC },
+    { NULL },
+};
+
+static const AVClass rawvideo_demuxer_class = {
+    .class_name = "rawvideo demuxer",
+    .item_name  = av_default_item_name,
+    .option     = rawvideo_options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
 AVInputFormat ff_rawvideo_demuxer = {
-    "rawvideo",
-    NULL_IF_CONFIG_SMALL("raw video format"),
-    sizeof(FFRawVideoDemuxerContext),
-    NULL,
-    ff_raw_read_header,
-    rawvideo_read_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-    .extensions = "yuv,cif,qcif,rgb",
-    .value = CODEC_ID_RAWVIDEO,
-    .priv_class = &ff_rawvideo_demuxer_class,
+    .name           = "rawvideo",
+    .long_name      = NULL_IF_CONFIG_SMALL("raw video format"),
+    .priv_data_size = sizeof(FFRawVideoDemuxerContext),
+    .read_header    = ff_raw_read_header,
+    .read_packet    = rawvideo_read_packet,
+    .flags          = AVFMT_GENERIC_INDEX,
+    .extensions     = "yuv,cif,qcif,rgb",
+    .raw_codec_id   = CODEC_ID_RAWVIDEO,
+    .priv_class     = &rawvideo_demuxer_class,
 };