Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / h263dec.c

diff --git a/libavformat/h263dec.c b/libavformat/h263dec.c
index 4aec94eb25a4cd6dd8907d5f6104e9592248a540..b07e9782b8e47ca34347aa5657553568d1954a64 100644 (file)
--- a/libavformat/h263dec.c
+++ b/libavformat/h263dec.c
@@ -20,7 +20,7 @@
  */
 
 #include "avformat.h"
-#include "raw.h"
+#include "rawdec.h"
 
 static int h263_probe(AVProbeData *p)
 {
@@ -64,14 +64,4 @@ static int h263_probe(AVProbeData *p)
     return 0;
 }
 
-AVInputFormat h263_demuxer = {
-    "h263",
-    NULL_IF_CONFIG_SMALL("raw H.263"),
-    0,
-    h263_probe,
-    ff_raw_video_read_header,
-    ff_raw_read_partial_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-//    .extensions = "h263", //FIXME remove after writing mpeg4_probe
-    .value = CODEC_ID_H263,
-};
+FF_DEF_RAWVIDEO_DEMUXER(h263, "raw H.263", h263_probe, NULL, CODEC_ID_H263)