generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,710 Commits 24 Branches 241 Tags 173 MiB
c6e0332f30
Commit Graph

26 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
45a8a02a41 lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:24:51 -04: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
e356fc57a2 lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:22:16 -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
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
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
Baptiste Coudurier
6125d86597 technically mp2 in pva needs AVSTREAM_PARSE_FULL 
Originally committed as revision 18966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-27 06:58:22 +00:00
Ivo van Poorten
896873b564 avoid possibly uninitialized return value 
(found by clang static analyzer)

Originally committed as revision 18669 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-23 18:44:03 +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
Ivo van Poorten
e03caf2efd Implement read_timestamp and enable seeking in PVA files. 
Originally committed as revision 11455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-07 23:42:52 +00:00
Ivo van Poorten
ffc2934112 cosmetics 
Originally committed as revision 11454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-07 23:40:04 +00:00
Ivo van Poorten
e661f76051 remove unnecessary check 
Originally committed as revision 11453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-07 23:39:47 +00:00
Ivo van Poorten
9ae092036b use ff_parse_pes_pts for parsing an MPEG-PES timestamp 
Originally committed as revision 11452 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-07 23:38:12 +00:00
Ivo van Poorten
5e40d0e898 cosmetics, superfluous space 
Originally committed as revision 11430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 22:33:27 +00:00
Ivo van Poorten
71e1080e28 proper check for valid pva_pts 
Originally committed as revision 11429 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 22:28:42 +00:00
Ivo van Poorten
dba13944f0 do not return an error, but warn and recover when encountering an audio packet 
that should countain a signaled mpeg-pes packet.

Originally committed as revision 11428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 22:27:49 +00:00
Ivo van Poorten
7705cf7e15 validate streamid before use 
Originally committed as revision 11427 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 22:18:44 +00:00
Ivo van Poorten
fe332ad66e change audio codec id to mp2 
Originally committed as revision 11426 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 22:15:19 +00:00
Ivo van Poorten
0e8a207ff8 proper type and initialization of pva_pts 
Originally committed as revision 11425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 22:13:27 +00:00
Ivo van Poorten
6a5ef2934c remove unnecessary shift 
Originally committed as revision 11424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 22:10:00 +00:00
Ivo van Poorten
3feb44a9be TechnoTrend PVA Demuxer 
Originally committed as revision 11371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-02 10:45:28 +00:00