[Sumover-dev] [svn commit] r3935 - vic/branches/mpeg4/win32/ffmpeg

[sumover-dev at cs.ucl.ac.uk]

Author: barz
Date: Thu Nov 16 04:23:47 2006
New Revision: 3935

Modified:
   vic/branches/mpeg4/win32/ffmpeg/avcodec.h
   vic/branches/mpeg4/win32/ffmpeg/avformat.h
   vic/branches/mpeg4/win32/ffmpeg/common.h

Log:
new ffmpeg and x264 headers/dll

Modified: vic/branches/mpeg4/win32/ffmpeg/avcodec.h
==============================================================================
--- vic/branches/mpeg4/win32/ffmpeg/avcodec.h	(original)
+++ vic/branches/mpeg4/win32/ffmpeg/avcodec.h	Thu Nov 16 04:23:47 2006
@@ -206,7 +206,9 @@
     CODEC_ID_MP2= 0x15000,
     CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3 decoding */
     CODEC_ID_AAC,
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
     CODEC_ID_MPEG4AAC,
+#endif
     CODEC_ID_AC3,
     CODEC_ID_DTS,
     CODEC_ID_VORBIS,
@@ -370,6 +372,7 @@
 #define CODEC_FLAG2_BRDO          0x00000400 ///< b-frame rate-distortion optimization
 #define CODEC_FLAG2_INTRA_VLC     0x00000800 ///< use MPEG-2 intra VLC table
 #define CODEC_FLAG2_MEMC_ONLY     0x00001000 ///< only do ME/MC (I frames -> ref, P frame -> ME+MC)
+#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format
 
 /* Unsupported options :
  *              Syntax Arithmetic coding (SAC)
@@ -2057,6 +2060,13 @@
      * - decoding: unused.
      */
     int max_partition_order;
+
+    /**
+     * GOP timecode frame start number, in non drop frame format
+     * - encoding: set by user.
+     * - decoding: unused.
+     */
+    int64_t timecode_frame_start;
 } AVCodecContext;
 
 /**
@@ -2652,6 +2662,8 @@
 extern AVBitStreamFilter dump_extradata_bsf;
 extern AVBitStreamFilter remove_extradata_bsf;
 extern AVBitStreamFilter noise_bsf;
+extern AVBitStreamFilter mp3_header_compress_bsf;
+extern AVBitStreamFilter mp3_header_decompress_bsf;
 
 
 /* memory */

Modified: vic/branches/mpeg4/win32/ffmpeg/avformat.h
==============================================================================
--- vic/branches/mpeg4/win32/ffmpeg/avformat.h	(original)
+++ vic/branches/mpeg4/win32/ffmpeg/avformat.h	Thu Nov 16 04:23:47 2006
@@ -236,6 +236,9 @@
     AVCodecContext *codec; /* codec context */
     /**
      * real base frame rate of the stream.
+     * this is the lowest framerate with which all timestamps can be
+     * represented accurately (its the least common multiple of all
+     * framerates in the stream), Note, this value is just a guess!
      * for example if the timebase is 1/90000 and all frames have either
      * approximately 3600 or 1800 timer ticks then r_frame_rate will be 50/1
      */
@@ -442,6 +445,7 @@
                        int64_t pos, int64_t timestamp, int size, int distance, int flags);
 int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts, int flags);
 void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp);
+int64_t av_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts, int64_t pos_min, int64_t pos_max, int64_t pos_limit, int64_t ts_min, int64_t ts_max, int flags, int64_t *ts_ret, int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ));
 
 /* media file output */
 int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap);

Modified: vic/branches/mpeg4/win32/ffmpeg/common.h
==============================================================================
--- vic/branches/mpeg4/win32/ffmpeg/common.h	(original)
+++ vic/branches/mpeg4/win32/ffmpeg/common.h	Thu Nov 16 04:23:47 2006
@@ -84,18 +84,7 @@
 #endif
 #endif
 
-#ifndef EMULATE_INTTYPES
 #   include <inttypes.h>
-#else
-    typedef signed char  int8_t;
-    typedef signed short int16_t;
-    typedef signed int   int32_t;
-    typedef unsigned char  uint8_t;
-    typedef unsigned short uint16_t;
-    typedef unsigned int   uint32_t;
-    typedef signed long long   int64_t;
-    typedef unsigned long long uint64_t;
-#endif /* EMULATE_INTTYPES */
 
 #ifndef PRId64
 #define PRId64 "lld"
@@ -157,16 +146,6 @@
 #define UINT64_MAX uint64_t_C(0xFFFFFFFFFFFFFFFF)
 #endif
 
-#ifdef EMULATE_FAST_INT
-typedef signed char int_fast8_t;
-typedef signed int  int_fast16_t;
-typedef signed int  int_fast32_t;
-typedef unsigned char uint_fast8_t;
-typedef unsigned int  uint_fast16_t;
-typedef unsigned int  uint_fast32_t;
-typedef uint64_t      uint_fast64_t;
-#endif
-
 #ifndef INT_BIT
 #    if INT_MAX != 2147483647
 #        define INT_BIT 64