Change mtv_read_packet so it does not break after seeking (displaying a shifted image).

[ffmpeg] / libavformat / raw.c

diff --git a/libavformat/raw.c b/libavformat/raw.c
index 05b77af1b824e577855fcf0155bcc502db19252d..3d8dbd0f8bcd916f125112dfc5db44aafb9a288a 100644 (file)
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -19,12 +19,13 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/crc.h"
+#include "libavcodec/ac3_parser.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "ac3_parser.h"
 #include "raw.h"
-#include "crc.h"
-#include "bitstream.h"
-#include "bytestream.h"
 
 #ifdef CONFIG_MUXERS
 /* simple formats */
@@ -187,11 +188,6 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-static int raw_read_close(AVFormatContext *s)
-{
-    return 0;
-}
-
 int pcm_read_seek(AVFormatContext *s,
                   int stream_index, int64_t timestamp, int flags)
 {
@@ -430,25 +426,35 @@ static int flac_probe(AVProbeData *p)
 
 AVInputFormat shorten_demuxer = {
     "shn",
-    "raw shorten",
+    NULL_IF_CONFIG_SMALL("raw Shorten"),
     0,
     NULL,
     audio_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "shn",
     .value = CODEC_ID_SHORTEN,
 };
 
+AVInputFormat mlp_demuxer = {
+    "mlp",
+    NULL_IF_CONFIG_SMALL("raw MLP"),
+    0,
+    NULL,
+    audio_read_header,
+    raw_read_partial_packet,
+    .flags= AVFMT_GENERIC_INDEX,
+    .extensions = "mlp",
+    .value = CODEC_ID_MLP,
+};
+
 AVInputFormat flac_demuxer = {
     "flac",
-    "raw flac",
+    NULL_IF_CONFIG_SMALL("raw FLAC"),
     0,
     flac_probe,
     audio_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "flac",
     .value = CODEC_ID_FLAC,
@@ -457,12 +463,12 @@ AVInputFormat flac_demuxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat flac_muxer = {
     "flac",
-    "raw flac",
+    NULL_IF_CONFIG_SMALL("raw FLAC"),
     "audio/x-flac",
     "flac",
     0,
     CODEC_ID_FLAC,
-    0,
+    CODEC_ID_NONE,
     flac_write_header,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
@@ -472,12 +478,11 @@ AVOutputFormat flac_muxer = {
 #ifdef CONFIG_AC3_DEMUXER
 AVInputFormat ac3_demuxer = {
     "ac3",
-    "raw ac3",
+    NULL_IF_CONFIG_SMALL("raw AC-3"),
     0,
     ac3_probe,
     audio_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "ac3",
     .value = CODEC_ID_AC3,
@@ -487,12 +492,12 @@ AVInputFormat ac3_demuxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat ac3_muxer = {
     "ac3",
-    "raw ac3",
+    NULL_IF_CONFIG_SMALL("raw AC-3"),
     "audio/x-ac3",
     "ac3",
     0,
     CODEC_ID_AC3,
-    0,
+    CODEC_ID_NONE,
     NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
@@ -500,12 +505,12 @@ AVOutputFormat ac3_muxer = {
 
 AVOutputFormat dts_muxer = {
     "dts",
-    "raw dts",
+    NULL_IF_CONFIG_SMALL("raw DTS"),
     "audio/x-dca",
     "dts",
     0,
     CODEC_ID_DTS,
-    0,
+    CODEC_ID_NONE,
     NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
@@ -515,12 +520,11 @@ AVOutputFormat dts_muxer = {
 
 AVInputFormat dirac_demuxer = {
     "dirac",
-    "raw dirac",
+    NULL_IF_CONFIG_SMALL("raw Dirac"),
     0,
     dirac_probe,
     video_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .value = CODEC_ID_DIRAC,
 };
@@ -528,11 +532,11 @@ AVInputFormat dirac_demuxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat dirac_muxer = {
     "dirac",
-    "raw dirac",
+    NULL_IF_CONFIG_SMALL("raw Dirac"),
     NULL,
     "drc",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_DIRAC,
     NULL,
     raw_write_packet,
@@ -542,12 +546,11 @@ AVOutputFormat dirac_muxer = {
 
 AVInputFormat dts_demuxer = {
     "dts",
-    "raw dts",
+    NULL_IF_CONFIG_SMALL("raw DTS"),
     0,
     dts_probe,
     audio_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "dts",
     .value = CODEC_ID_DTS,
@@ -555,12 +558,11 @@ AVInputFormat dts_demuxer = {
 
 AVInputFormat aac_demuxer = {
     "aac",
-    "ADTS AAC",
+    NULL_IF_CONFIG_SMALL("ADTS AAC"),
     0,
     NULL,
     audio_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "aac",
     .value = CODEC_ID_AAC,
@@ -568,12 +570,11 @@ AVInputFormat aac_demuxer = {
 
 AVInputFormat gsm_demuxer = {
     "gsm",
-    "GSM",
+    NULL_IF_CONFIG_SMALL("GSM"),
     0,
     NULL,
     audio_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "gsm",
     .value = CODEC_ID_GSM,
@@ -583,7 +584,7 @@ AVInputFormat gsm_demuxer = {
 AVOutputFormat roq_muxer =
 {
     "RoQ",
-    "Id RoQ format",
+    NULL_IF_CONFIG_SMALL("id RoQ format"),
     NULL,
     "roq",
     0,
@@ -596,12 +597,11 @@ AVOutputFormat roq_muxer =
 
 AVInputFormat h261_demuxer = {
     "h261",
-    "raw h261",
+    NULL_IF_CONFIG_SMALL("raw H.261"),
     0,
     h261_probe,
     video_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "h261",
     .value = CODEC_ID_H261,
@@ -610,11 +610,11 @@ AVInputFormat h261_demuxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat h261_muxer = {
     "h261",
-    "raw h261",
+    NULL_IF_CONFIG_SMALL("raw H.261"),
     "video/x-h261",
     "h261",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_H261,
     NULL,
     raw_write_packet,
@@ -624,12 +624,11 @@ AVOutputFormat h261_muxer = {
 
 AVInputFormat h263_demuxer = {
     "h263",
-    "raw h263",
+    NULL_IF_CONFIG_SMALL("raw H.263"),
     0,
     h263_probe,
     video_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
 //    .extensions = "h263", //FIXME remove after writing mpeg4_probe
     .value = CODEC_ID_H263,
@@ -638,11 +637,11 @@ AVInputFormat h263_demuxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat h263_muxer = {
     "h263",
-    "raw h263",
+    NULL_IF_CONFIG_SMALL("raw H.263"),
     "video/x-h263",
     "h263",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_H263,
     NULL,
     raw_write_packet,
@@ -652,12 +651,11 @@ AVOutputFormat h263_muxer = {
 
 AVInputFormat m4v_demuxer = {
     "m4v",
-    "raw MPEG4 video format",
+    NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
     0,
     mpeg4video_probe, /** probing for mpeg4 data */
     video_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "m4v", //FIXME remove after writing mpeg4_probe
     .value = CODEC_ID_MPEG4,
@@ -666,7 +664,7 @@ AVInputFormat m4v_demuxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat m4v_muxer = {
     "m4v",
-    "raw MPEG4 video format",
+    NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
     NULL,
     "m4v",
     0,
@@ -680,12 +678,11 @@ AVOutputFormat m4v_muxer = {
 
 AVInputFormat h264_demuxer = {
     "h264",
-    "raw H264 video format",
+    NULL_IF_CONFIG_SMALL("raw H.264 video format"),
     0,
     NULL /*mpegvideo_probe*/,
     video_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe
     .value = CODEC_ID_H264,
@@ -694,7 +691,7 @@ AVInputFormat h264_demuxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat h264_muxer = {
     "h264",
-    "raw H264 video format",
+    NULL_IF_CONFIG_SMALL("raw H.264 video format"),
     NULL,
     "h264",
     0,
@@ -708,12 +705,11 @@ AVOutputFormat h264_muxer = {
 
 AVInputFormat mpegvideo_demuxer = {
     "mpegvideo",
-    "MPEG video",
+    NULL_IF_CONFIG_SMALL("MPEG video"),
     0,
     mpegvideo_probe,
     video_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .value = CODEC_ID_MPEG1VIDEO,
 };
@@ -721,11 +717,11 @@ AVInputFormat mpegvideo_demuxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat mpeg1video_muxer = {
     "mpeg1video",
-    "MPEG video",
+    NULL_IF_CONFIG_SMALL("MPEG video"),
     "video/x-mpeg",
     "mpg,mpeg,m1v",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_MPEG1VIDEO,
     NULL,
     raw_write_packet,
@@ -736,11 +732,11 @@ AVOutputFormat mpeg1video_muxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat mpeg2video_muxer = {
     "mpeg2video",
-    "MPEG2 video",
+    NULL_IF_CONFIG_SMALL("MPEG-2 video"),
     NULL,
     "m2v",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_MPEG2VIDEO,
     NULL,
     raw_write_packet,
@@ -750,12 +746,11 @@ AVOutputFormat mpeg2video_muxer = {
 
 AVInputFormat mjpeg_demuxer = {
     "mjpeg",
-    "MJPEG video",
+    NULL_IF_CONFIG_SMALL("MJPEG video"),
     0,
     NULL,
     video_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "mjpg,mjpeg",
     .value = CODEC_ID_MJPEG,
@@ -763,12 +758,11 @@ AVInputFormat mjpeg_demuxer = {
 
 AVInputFormat ingenient_demuxer = {
     "ingenient",
-    "Ingenient MJPEG",
+    NULL_IF_CONFIG_SMALL("Ingenient MJPEG"),
     0,
     NULL,
     video_read_header,
     ingenient_read_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "cgi", // FIXME
     .value = CODEC_ID_MJPEG,
@@ -777,11 +771,11 @@ AVInputFormat ingenient_demuxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat mjpeg_muxer = {
     "mjpeg",
-    "MJPEG video",
+    NULL_IF_CONFIG_SMALL("MJPEG video"),
     "video/x-mjpeg",
     "mjpg,mjpeg",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_MJPEG,
     NULL,
     raw_write_packet,
@@ -791,12 +785,11 @@ AVOutputFormat mjpeg_muxer = {
 
 AVInputFormat vc1_demuxer = {
     "vc1",
-    "raw vc1",
+    NULL_IF_CONFIG_SMALL("raw VC-1"),
     0,
     NULL /* vc1_probe */,
     video_read_header,
     raw_read_partial_packet,
-    raw_read_close,
     .extensions = "vc1",
     .value = CODEC_ID_VC1,
 };
@@ -806,12 +799,12 @@ AVInputFormat vc1_demuxer = {
 #define PCMINPUTDEF(name, long_name, ext, codec) \
 AVInputFormat pcm_ ## name ## _demuxer = {\
     #name,\
-    long_name,\
+    NULL_IF_CONFIG_SMALL(long_name),\
     0,\
     NULL,\
     raw_read_header,\
     raw_read_packet,\
-    raw_read_close,\
+    NULL,\
     pcm_read_seek,\
     .flags= AVFMT_GENERIC_INDEX,\
     .extensions = ext,\
@@ -821,12 +814,12 @@ AVInputFormat pcm_ ## name ## _demuxer = {\
 #define PCMOUTPUTDEF(name, long_name, ext, codec) \
 AVOutputFormat pcm_ ## name ## _muxer = {\
     #name,\
-    long_name,\
+    NULL_IF_CONFIG_SMALL(long_name),\
     NULL,\
     ext,\
     0,\
     codec,\
-    0,\
+    CODEC_ID_NONE,\
     NULL,\
     raw_write_packet,\
     .flags= AVFMT_NOTIMESTAMPS,\
@@ -906,12 +899,11 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVInputFormat rawvideo_demuxer = {
     "rawvideo",
-    "raw video format",
+    NULL_IF_CONFIG_SMALL("raw video format"),
     0,
     NULL,
     raw_read_header,
     rawvideo_read_packet,
-    raw_read_close,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "yuv,cif,qcif,rgb",
     .value = CODEC_ID_RAWVIDEO,
@@ -920,7 +912,7 @@ AVInputFormat rawvideo_demuxer = {
 #ifdef CONFIG_MUXERS
 AVOutputFormat rawvideo_muxer = {
     "rawvideo",
-    "raw video format",
+    NULL_IF_CONFIG_SMALL("raw video format"),
     NULL,
     "yuv,rgb",
     0,
@@ -940,7 +932,7 @@ static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 
 AVOutputFormat null_muxer = {
     "null",
-    "null video format",
+    NULL_IF_CONFIG_SMALL("null video format"),
     NULL,
     NULL,
     0,