RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
32,659 Commits 37 Branches 400 Tags 271 MiB
Commit Graph

40 Commits

Author SHA1 Message Date
Michael Niedermayer 78accb876c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ffmpeg: fix some indentation
  ffmpeg: fix operation with --disable-avfilter
  simple_idct: remove disabled code
  motion_est: remove disabled code
  vc1: remove disabled code
  fate: separate lavf-mxf_d10 test from lavf-mxf
  cabac: Move code only used in the cabac test program to cabac.c.
  ffplay: warn that -pix_fmt is no longer working, suggest alternative
  ffplay: warn that -s is no longer working, suggest alternative
  lavf: rename enc variable in utils.c:has_codec_parameters()
  lavf: use designated initialisers for all (de)muxers.
  wav: remove a use of deprecated AV_METADATA_ macro
  rmdec: remove useless ap parameter from rm_read_header_old()
  dct-test: remove write-only variable
  des: fix #if conditional around P_shuffle
  Use LOCAL_ALIGNED in ff_check_alignment()

Conflicts:
	ffmpeg.c
	libavformat/avidec.c
	libavformat/matroskaenc.c
	libavformat/mp3enc.c
	libavformat/oggenc.c
	libavformat/utils.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-17 20:12:02 +02:00
Anton Khirnov dfc2c4d900 lavf: use designated initialisers for all (de)muxers. 
It's more readable and less prone to breakage.
 2011-07-17 06:58:37 +02:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Anton Khirnov b7f2fdde74 avio: rename put_flush_packet -> avio_flush 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov 76aa876e69 avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 11:03:39 -05:00
Anton Khirnov a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
Anton Khirnov 6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
Anton Khirnov 77eb5504d3 avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 14:25:15 -05:00
Anton Khirnov b7effd4e83 avio: avio_ prefixes for get_* functions 
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 11:23:22 -05:00
Anton Khirnov ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Diego Elio Pettenò c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +00:00
Diego Biurrun ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Jean-Daniel Dupas cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +00:00
Stefano Sabatini 72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Daniel Verkamp 1a40491ef2 Add ff_ prefixes to exported symbols in libavformat/riff.h. 
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-22 23:09:34 +00:00
Diego Biurrun bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Aurelien Jacobs b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Oded Shimon bffc76bd17 Update lavf/libnut.c to _tt type names in libnut API 
Originally committed as revision 16075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 05:10:43 +00:00
Diego Biurrun 8212568a1c Replace generic CONFIG_MUXERS preprocessor conditionals by more specific 
CONFIG_FOO_MUXER conditionals where appropriate.

Originally committed as revision 15158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-02 22:45:13 +00:00
Aurelien Jacobs 5972945197 convert every muxer/demuxer to write/read sample_aspect_ratio from/to 
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 23:43:20 +00:00
Stefano Sabatini bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL. 
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 16:20:54 +00:00
Björn Axelsson 899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext 
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-21 07:41:00 +00:00
Diego Biurrun 0d49b9ad07 Give the libnut muxer a lib prefix in its name so it does not conflict with 
the native implementation.

Originally committed as revision 10941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-07 19:05:47 +00:00
Ramiro Polla 5fdb9cc50a Prefix library format names with 'lib' in libavformat 
Originally committed as revision 10414 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-05 18:55:20 +00:00
Michael Niedermayer 87e8788680 allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks 
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 11:34:15 +00:00
Oded Shimon 1017fafb20 remove usage of deprecated functions in libnut.c (codec_get_id/tag) 
Originally committed as revision 8316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-10 18:39:58 +00:00
Oded Shimon 0020596f92 Add doxygen file header to libnut.c 
Originally committed as revision 8315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-10 18:34:15 +00:00
Diego Biurrun eca06097d3 Add LGPL header as requested by Oded. 
Originally committed as revision 8126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-25 19:23:14 +00:00
Diego Biurrun d7c592475d Properly separate native and libnut NUT (de)muxers. 
Originally committed as revision 7891 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-09 08:28:47 +00:00
Michael Niedermayer 7caf0cc62c add codec_id <-> codec_tag tables to AVIn/OutputFormat 
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 01:39:17 +00:00
Oded Shimon d7d3efae82 sync to libnut, nom->num 
Originally committed as revision 7367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-23 12:33:37 +00:00
Oded Shimon 468f8102d5 change mpeg4 fourcc from "mp4s" to "mp4v" 
Originally committed as revision 7116 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-17 16:54:18 +00:00
Oded Shimon bf054f7430 update to libnut, use framecode table generator 
Originally committed as revision 7115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-17 16:53:42 +00:00
Oded Shimon a851cf8cf7 update to libnut API, changes to frame_table_input 
Originally committed as revision 7114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-17 14:43:14 +00:00
Oded Shimon e4bb70838f Update to libnut API, non-negative errors 
Originally committed as revision 7094 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-16 07:33:25 +00:00
Oded Shimon 9123f531be update to libnut API, don't free the streams 
Originally committed as revision 7087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-15 11:29:39 +00:00
Oded Shimon 0d666a47a7 update to libnut, add cache_syncpoints 
Originally committed as revision 7062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 17:01:33 +00:00
Oded Shimon 4d8aa1c38b update to libnut API, rename nut.h->libnut.h 
Originally committed as revision 7051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 06:02:15 +00:00
Oded Shimon b43afb5343 change include "nut.h" to <nut.h> to make gcc pick the correct nut.h for libnut de/muxer.. 
Originally committed as revision 6985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 16:24:05 +00:00
Oded Shimon f956e12954 Add libnut support until ffmpeg gets an independant and complete de/muxer for NUT 
Originally committed as revision 6977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 06:09:15 +00:00