generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
46,082 Commits 24 Branches 241 Tags 173 MiB
5f9cbad603
Commit Graph

135 Commits

Author SHA1 Message Date
Anton Khirnov
b92c545282 avio: avio_ prefix for url_open_dyn_buf 2011-04-03 22:46:56 +02:00
Michael Niedermayer
1caa4123bd Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers
  mlp_parse.c: set AVCodecContext channel_layout
  APIChanges: mark the place where 0.6 was branched.
  avio: make get_checksum() internal.
  avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h
  avio: make init_checksum() internal.
NOT MERGED  Add MxPEG decoder
NOT MERGED  Add support for picture_ptr field in MJpegDecodeContext
NOT MERGED  Move MJPEG's input buffer preprocessing in separate public function
NOT MERGED  Support reference picture defined by bitmask in MJPEG's SOS decoder
  sndio bug fix

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-31 12:48:41 +02:00
Anton Khirnov
b64030f26d avio: make get_checksum() internal. 2011-03-30 07:48:55 +02:00
Anton Khirnov
4c4427a75d avio: make init_checksum() internal. 2011-03-30 07:47:08 +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
2cface71ca nutenc: fix a memleak 
This fixes a minor memory leak introduced in 073f8b1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-17 16:25:54 +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
073f8b10d8 nutenc: mux chapters. 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-17 03:34:16 +01: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
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
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
Anton Khirnov
03700d399b Export metadata in the generic format. Deprecate old conversion API. 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 19:04:25 +00:00
Måns Rullgård
324d22b2b4 nutenc: fix unstable floating-point calculations 
Originally committed as revision 25095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-10 13:16:08 +00:00
Michael Chinen
603e5c0b71 move ff_get_v_length and ff_put_v from nutenc.c to internal.h/aviobuf.c 
patch by Micheal Chinen < mchinen gmail >

Originally committed as revision 24140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-09 12:14:33 +00:00
Michael Chinen
f8280ff4c0 rename get_length to ff_get_v_length and put_v to ff_put_v 
patch by Michael Chinen < mchinen gmail >

Originally committed as revision 24139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-09 12:10:47 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38:06 +00:00
Stefano Sabatini
fa58643993 Make write_streamheader() log a message if there is no codec tag 
defined.

Originally committed as revision 23434 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-02 21:57:40 +00:00
Stefano Sabatini
ffd5f09844 Make write_streamheader() return a meaningful error code if no codec 
tag is defined, rather than return -1.

Originally committed as revision 23433 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-02 21:57:37 +00:00
Stefano Sabatini
fc0c41240e Make write_header() and write_headers() return an error code in case of 
error.

Originally committed as revision 23432 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-02 21:57:35 +00:00
Stefano Sabatini
da9e6c4295 Make write_streamheader() and write_headers() accept an 
AVFormatContext * in input rather than a NUTContext *, which allows to
log messages with av_log().

Originally committed as revision 23431 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-02 21:57:30 +00:00
Stefano Sabatini
2e01def0fe Define ff_nut_video_tags and make Nut muxer and demuxer set it in 
codec_tag.

Originally committed as revision 23259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-23 18:34:15 +00:00
Francesco Lavra
80b39e1ca6 Move AVCodecTag from riff.h into internal.h. 
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 16:01:32 +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
Vitor Sessak
f990f6e3f7 Fix NUT (de)muxer warnings: 
CC    libavformat/nutdec.o
libavformat/nutdec.c: In function ‘read_seek’:
libavformat/nutdec.c:862: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:871: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:879: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
CC    libavformat/nutenc.o
libavformat/nutenc.c: In function ‘write_packet’:
libavformat/nutenc.c:680: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’

Originally committed as revision 22707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-28 09:59:58 +00:00
Vitor Sessak
4b83fc0fe4 Plug memory leak in NUT muxer and demuxer 
Originally committed as revision 22174 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 17:31:24 +00:00
Vitor Sessak
8a4d067dfc Revert r22119 and partially revert 22120. 
Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 18:16:10 +00:00
Vitor Sessak
27dbc47c05 Plug some memory leaks in NUT muxer and demuxer 
Originally committed as revision 22120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 20:49:21 +00:00
Anton Khirnov
43382b5f13 Introduce metadata conversion table for NUT muxer and demuxer. 
Patch by Anton Khirnov (wyskas, do no evil mail)
Thread "[PATCH] nut metadata conversion table"

Originally committed as revision 22015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 06:27:12 +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
Aurelien Jacobs
73914d56d9 use new metadata API in nut muxer 
This is only a straight conversion of current code, so for now, it won't
mux generic metadata. It will only mux Title, Author and Copyright.

Originally committed as revision 17653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 23:12:14 +00:00
Michael Niedermayer
2591821213 Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames. 
Originally committed as revision 17554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 15:04:18 +00:00
Diego Biurrun
1bf6e565dd cosmetics: 'const static' --> 'static const' to avoid warnings of the type 
"'static' is not at beginning of declaration" with -Wextra.

Originally committed as revision 17391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-17 12:03:10 +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
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +00:00
Michael Niedermayer
52afa376b8 remove _t for POSIX compatibility. 
Originally committed as revision 16057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 19:06:24 +00:00
Reimar Döffinger
c18545929e Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const * 
Originally committed as revision 14947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-24 16:51:50 +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
Justin Ruggles
2d47c3de98 remove a comment which is no longer true 
Originally committed as revision 14522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-03 16:41:52 +00:00
Michael Niedermayer
f53dd4682c Prevent invalid timestamps from being stored. 
Originally committed as revision 13983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 22:37:26 +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
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Diego Biurrun
7ce6892373 misc spelling fixes 
Originally committed as revision 12410 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 18:42:09 +00:00
Evgeniy Stepanov
90c2295b24 Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing 
of matroska and nut.

Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-07 19:25:09 +00:00
Michael Niedermayer
1326621c1a Subtitle support. (untested) 
Originally committed as revision 12330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 13:06:49 +00:00
Michael Niedermayer
a048febdc4 subtitles (codec tag tables still missing ...) 
Originally committed as revision 12292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-02 23:11:36 +00:00
Michael Niedermayer
e942293db1 It appears last_pts was not set ... 
Originally committed as revision 11939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-15 13:21:00 +00:00
Michael Niedermayer
a712d725c0 Header elision muxing support. 
This only removes 2 bytes from MP3 and MP2 currently.
Up to 4 could be removed from MP3/MP2 though this might need a 2pass muxer.
Primitive code to remove headers from MPEG-1/2/4 is there too but for the
single file I tried it on (the one in the regression tests), it was a loss
because all video frames were >4096 byte, so that it is disabled ATM.

Originally committed as revision 11936 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-15 02:57:19 +00:00
Oded Shimon
4ddcc983b4 back_ptr calculation used wrong timebase when searching for back syncpoint 
Originally committed as revision 11856 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 10:48:41 +00:00
Oded Shimon
02c986a8d6 Fix intented algo in syncpoint writing before keyframes in NUT muxer 
Originally committed as revision 11855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 10:45:32 +00:00
Oded Shimon
82badd27f1 nut->max_distance was not set at all anywhere in the NUT muxer 
Originally committed as revision 11854 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 10:34:35 +00:00
Michael Niedermayer
4cf97abb98 Missing const found by -Wwrite-strings. 
Originally committed as revision 11841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 00:26:43 +00:00
Michael Niedermayer
175e23e875 Consider initial EOR in the back_ptr calculation. 
Originally committed as revision 11550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-17 13:59:52 +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
Baptiste Coudurier
992e78f5f2 rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers 
Originally committed as revision 10873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-30 00:01:25 +00:00
Diego Biurrun
93951943ec spelling/wording cosmetics 
Originally committed as revision 10131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-17 10:45:50 +00:00
Michael Niedermayer
63dd9d0ee3 simplify 
Originally committed as revision 10068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 11:12:34 +00:00
Michael Niedermayer
d2062ff64d do not remove FLAG_CODED 
Originally committed as revision 10067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 11:10:29 +00:00
Michael Niedermayer
0e6472fdcb remove useless code, found by oded 
Originally committed as revision 10066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 10:12:39 +00:00
Michael Niedermayer
0a5790d1a9 ensure that the aspect ratio is spec compliant 
Originally committed as revision 10056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-10 14:23:18 +00:00
Michael Niedermayer
1b0353be6d disable TRACE 
Originally committed as revision 10053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-10 13:04:45 +00:00
Michael Niedermayer
a17e046a42 muxer should now be spec compliant (though it likely still contains bugs!) 
Originally committed as revision 10052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-10 13:04:16 +00:00
Michael Niedermayer
14b3f9961f header repetition 
Originally committed as revision 10051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-10 12:59:17 +00:00
Michael Niedermayer
ead1939f69 info packet 
Originally committed as revision 10050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-10 11:52:28 +00:00
Michael Niedermayer
caeeefd7a4 more FIXME 
Originally committed as revision 10044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-10 00:13:50 +00:00
Michael Niedermayer
100d8eb8dc muxer is not yet fully compliant so prevent people from mistakenly using it 
while believing it already is

Originally committed as revision 10042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-10 00:11:36 +00:00
Michael Niedermayer
7c04134fa1 set back ptr properly 
Originally committed as revision 10039 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 23:29:58 +00:00
Michael Niedermayer
f0a9978c92 fix header_checksum 
Originally committed as revision 10036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 21:20:17 +00:00
Michael Niedermayer
bd533e6cbc store headers twice (getting closer to spec compliance ...) 
Originally committed as revision 10035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 21:14:00 +00:00
Michael Niedermayer
7e506494b1 move header writing into its own function 
Originally committed as revision 10034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 21:10:11 +00:00
Michael Niedermayer
7a26da44b0 get rid of printf 
Originally committed as revision 10033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 21:04:10 +00:00
Michael Niedermayer
e1249ba92f write frames and syncpoints 
Originally committed as revision 10032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 21:01:22 +00:00
Michael Niedermayer
491216c672 put_t() 
Originally committed as revision 10031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 20:56:42 +00:00
Michael Niedermayer
6e6cf116d8 100l 
Originally committed as revision 10030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 20:55:09 +00:00
Michael Niedermayer
34f8cc3802 2 FIXME comments 
Originally committed as revision 10029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 20:54:17 +00:00
Michael Niedermayer
0fcfa8eb36 add a universal fallback frame code for the case that no other applies 
Originally committed as revision 10028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 20:52:49 +00:00
Michael Niedermayer
6c666941eb forw_ptr CRC 
Originally committed as revision 10016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 12:48:52 +00:00
Michael Niedermayer
8d9a3f7e21 use a dynamic ByteIOContext instead of using the lavf buffer 
this makes the code work with big packets, it is also simpler and saves
a byte or 2

Originally committed as revision 10015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 12:38:24 +00:00
Michael Niedermayer
0809b51e52 move stream header writing into its own function 
Originally committed as revision 10014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 12:25:58 +00:00
Michael Niedermayer
97d5eb11db move main header writing into its own function 
Originally committed as revision 10013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 12:22:02 +00:00
Michael Niedermayer
e999435a60 write correct time_base 
Originally committed as revision 10011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 11:06:54 +00:00
Michael Niedermayer
efd8f22a16 make StreamContext.time_base a pointer 
Originally committed as revision 10010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 11:04:43 +00:00
Michael Niedermayer
dcc9bde010 write stream headers 
Originally committed as revision 10008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 10:45:19 +00:00
Michael Niedermayer
70ea1e6922 trying to finally get the nut muxer back uptodate 
this one only writes the framecode table and mainheader though they should be
compliant to the current spec

Originally committed as revision 10006 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 01:12:48 +00:00