add 'wide' reversed tag in probe, detect broken xdcam files xdcam_hd_1080i60.mov

[ffmpeg] / libavformat / avs.c

diff --git a/libavformat/avs.c b/libavformat/avs.c
index deb825fb51e067fb16136103e83ee05398843dc7..5325ff6610895540b2930d993eb4b9ab75496b4e 100644 (file)
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -2,18 +2,20 @@
  * AVS demuxer.
  * Copyright (c) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
@@ -41,15 +43,10 @@ typedef enum avs_block_type {
     AVS_GAME_DATA = 0x04,
 } avs_block_type_t;
 
-
-#ifdef CONFIG_DEMUXERS
-
 static int avs_probe(AVProbeData * p)
 {
     const uint8_t *d;
 
-    if (p->buf_size < 2)
-        return 0;
     d = p->buf;
     if (d[0] == 'w' && d[1] == 'W' && d[2] == 0x10 && d[3] == 0)
         return 50;
@@ -217,7 +214,7 @@ static int avs_read_close(AVFormatContext * s)
     return 0;
 }
 
-static AVInputFormat avs_demuxer = {
+AVInputFormat avs_demuxer = {
     "avs",
     "avs format",
     sizeof(avs_format_t),
@@ -226,13 +223,3 @@ static AVInputFormat avs_demuxer = {
     avs_read_packet,
     avs_read_close,
 };
-
-#endif /* CONFIG_DEMUXERS */
-
-int avs_init(void)
-{
-#ifdef CONFIG_DEMUXERS
-    av_register_input_format(&avs_demuxer);
-#endif /* CONFIG_DEMUXERS */
-    return 0;
-}