ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 14:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,678 Commits 36 Branches 398 Tags 535 MiB
5631729c3d
Commit Graph

20 Commits

Author SHA1 Message Date
Michael Niedermayer
c0e51ec9c6 Merge remote branch 'qatar/master' 
* qatar/master:
  Fix parser: mark av_parser_parse() for removal on next major bump
  swscale: postpone sws_getContext removal until next major bump.
  fate: add AAC LATM test
  mmst: get rid of deprecated AVERRORs
  lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.
  Reemove remaining uses of deprecated AVERROR_NOTSUPP.
REIMPLEMENTED in 2 lines of code:  lavf: if id3v2 tag is present and all else fails, guess by file extension

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 03:32:26 +02:00
Anton Khirnov
f5b386afab Reemove remaining uses of deprecated AVERROR_NOTSUPP. 2011-04-06 14:10: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
66e5b1df36 avio: deprecate url_feof 
AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 17:20:31 -05:00
Anton Khirnov
471fe57e1a avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
 2011-02-20 19:05:47 +01: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ò
66355be3c3 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.
(cherry picked from commit c6610a216e)
 2011-01-28 03:15:34 +01: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
Aurelien Jacobs
87d69d3232 use designated initializer in ASS (de)muxer 
Originally committed as revision 25868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 00:37:53 +00:00
Aurelien Jacobs
ac066b83e9 add seeking support in ASS demuxer 
Originally committed as revision 24578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-29 22:10:22 +00:00
Aurelien Jacobs
8a810ccbba use return value of ff_get_line() 
Originally committed as revision 24402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 21:41:46 +00:00
Aurelien Jacobs
7c89295145 move ff_get_line to aviobuf.c 
Originally committed as revision 24399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 21:39:01 +00:00
Aurelien Jacobs
80769fb73f rename get_line to ff_get_line 
Originally committed as revision 24398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 21:35:44 +00:00
Aurelien Jacobs
5c7ceef654 improve long_name for ass (de)muxer 
Originally committed as revision 24084 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 13:10:57 +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
Michael Niedermayer
8ba311410a Silence "assdec.c:146: warning: passing argument 4 of ‘qsort’ from incompatible pointer type" 
The alternative (schoolbook) solution is less readable.

Originally committed as revision 17230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 15:44:46 +00:00
Aurelien Jacobs
7a8b7634c5 assdec: don't remove CR, they are part of the spec 
Originally committed as revision 15442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-27 23:12:24 +00:00
Michael Niedermayer
5c8a1d1927 Do not lose the '\n'. 
Originally committed as revision 15424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 03:24:05 +00:00
Michael Niedermayer
de3ae185a4 2 in 1, an ASS and SSA demuxer. 
Tested with -scodec copy on all ASS & SSA samples that i found on mphq (exactly 2).

Originally committed as revision 15422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 02:19:21 +00:00