RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
42,473 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

42473 Commits

Author SHA1 Message Date
Paul B Mahol d3abbb1d13 lavc: fix ff_alloc_packet() 
Regression introduced in 740b9ff44.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-13 01:09:43 +00:00
Michael Niedermayer 81fe2e8b36 build_system: mark libfdk as non GPL compatible until the situation is clarified by someone qualified. 
The license fee text may be interpreted as a additional restriction in the GPL sense.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-13 00:51:01 +02:00
Michael Niedermayer 620c6292b1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: Fix Ogg demuxer dependencies
  build: Fix FLAC demuxer dependencies
  flac: Move flac functions shared between libraries to flac common code
  build: Fix CAF demuxer dependencies
  build: Fix MP2 muxer dependencies
  build: Add missing build rules for the ISMV muxer
  configure: Drop redundant mxf_d10 test dependency declaration
  Support AAC encoding via the external library fdk-aac
  libavcodec: Add more AAC profiles
  dct/fft-test: use a replacement getopt() if the system has none present.

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-12 23:57:00 +02:00
Michael Niedermayer f9c823df13 lclenc: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-12 23:18:48 +02:00
Michael Niedermayer db03f91f4b mxfenc: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-12 23:16:52 +02:00
Michael Niedermayer 375c0f74d1 av_samples_copy: support overlapping copies 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-12 22:25:25 +02:00
Michael Niedermayer 19ff479f69 mp3dec: parse initial silence padding information from lame tag 
And pass the information on to the lavf core.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-12 22:25:25 +02:00
Michael Niedermayer 018601dbf9 lavf: inject sample skip side data when requested by the demuxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-12 20:32:03 +02:00
Robert Krüger c916af995d add output for frame timestamps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-12 20:18:03 +02:00
Paul B Mahol f7e26cca89 exr: rle decompression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-12 17:36:55 +00:00
Nicolas George 26d7232722 configure: produce useful uninstalled pc files. 
The old files were scattered in several directories,
with an unusual name, but dependencies to the usual name,
and relative paths.

The new files are regrouped in a singled directory
(doc/examples/pc-uninstalled) with their usual name
and more absolute paths.

With this change, it becomes possible to compile the examples
with the ffmpeg build tree by setting the environment variable:
PKG_CONFIG_PATH=pc-uninstalled
 2012-07-12 14:58:52 +02:00
Diego Biurrun 0da29727ea build: Fix Ogg demuxer dependencies 2012-07-12 11:11:25 +02:00
Diego Biurrun b896008271 build: Fix FLAC demuxer dependencies 2012-07-12 11:11:24 +02:00
Diego Biurrun 8eea8fdceb flac: Move flac functions shared between libraries to flac common code 
This fixes a number of flac-related build dependencies.
 2012-07-12 11:11:23 +02:00
Diego Biurrun a519463366 build: Fix CAF demuxer dependencies 2012-07-12 10:45:21 +02:00
Diego Biurrun b7884ff7af build: Fix MP2 muxer dependencies 2012-07-12 10:45:21 +02:00
Diego Biurrun d648de61e6 build: Add missing build rules for the ISMV muxer 2012-07-12 10:45:20 +02:00
Diego Biurrun 7d605d5115 configure: Drop redundant mxf_d10 test dependency declaration 
The mxf_d10 test depends on avconv, which depends on avfilter, so there
is no need to declare an avfilter dependency for the mxf_d10 test.
 2012-07-12 10:45:20 +02:00
Martin Storsjö 37eeb5e273 Support AAC encoding via the external library fdk-aac 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-12 11:01:10 +03:00
Martin Storsjö 372597e538 libavcodec: Add more AAC profiles 
The numerical values of the profiles are the MPEG4 Audio Object
Type values, minus one.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-12 10:54:15 +03:00
Paul B Mahol a568a84edf exr: cache some values 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-12 01:07:22 +00:00
Hendrik Leppkes 65219c3851 dca: map xxch side channels to AV_CH_SIDE_LEFT/RIGHT instead of REAR. 
This fixes decoding of certain 7.1 DTS-HD HRA files, as well as matches the spec better.
Table 6-22 in the DTS spec labels the two channels "Left/Right surround on side", and not rear.

Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Reviewed-by: Nick Brereton <nick@nbrereton.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-12 02:33:16 +02:00
Michael Niedermayer 9ca27df52f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Check for the math function rint
  TechSmith Screen Codec 2 decoder
  rtsp: Add listen mode
  rtsp: Make rtsp_open_transport_ctx() non-static
  rtsp: Move rtsp_read_close
  rtsp: Parse the mode=receive/record parameter in transport lines

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-11 23:57:11 +02:00
Michael Niedermayer 5f298c6791 vorbisdec: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-11 23:26:55 +02:00
Michael Niedermayer e3c2d83183 avidec: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-11 23:26:55 +02:00
Paul B Mahol 74f3c53b57 exr: zip decompression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-11 20:46:56 +00:00
Paul B Mahol 5ee41d00f6 exr: remove dead assigment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-11 20:43:37 +00:00
Ronald S. Bultje 667fb97a65 dct/fft-test: use a replacement getopt() if the system has none present. 
This allows compiling and running these tests on systems lacking a built-
in version of getopt(), such as MSVC.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-07-11 21:24:37 +02:00
Ronald S. Bultje 183b1c2268 configure: Check for the math function rint 
Add a fallback implementation if it doesn't exist.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-11 10:40:11 +03:00
Kostya Shishkov 781888da89 TechSmith Screen Codec 2 decoder 2012-07-11 07:29:05 +02:00
Michael Niedermayer dd0a9b78db replace all __volatile__ by volatile 
__volatile__ can cause problems with some compilers and volatile is a standard keyword.

Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-11 04:04:29 +02:00
Matthieu Bouron b8a90976da lavf/mxfenc: fix dnxhd codec uls and aspect ratio 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-11 04:00:57 +02:00
Paul B Mahol 9b3f9f43a7 tiffenc: use av_fast_padded_malloc(z) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-10 22:01:38 +00:00
Paul B Mahol 0e003d8c91 lavc: add av_fast_padded_mallocz 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-10 21:42:23 +00:00
Paul B Mahol ca16f88c75 tiffenc: add .init 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-10 21:32:58 +00:00
Nicolas George 5a9d6993cb parseutils: ignore digits below the microsecond. 
Accept 1.1234567 as simply 1.123456 instead of rejecting it.
The rounding is towards 0, which is acceptable and much simpler.
 2012-07-10 22:29:08 +02:00
Jordi Ortiz a8ad6ffafe rtsp: Add listen mode 
This makes the RTSP demuxer act as a server, listening for an
incoming connection.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 22:00:28 +03:00
Michael Niedermayer b27c7d70d8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mss1: fix decoding masked regions in interframes
  mxfdec: fix off by one error.
  mxfdec: only parse next partition pack if parsing forward
  mxfdec: let pkt->pts = mxf->current_edit_unit if intra-only
  mxfdec: fix frame height vs field height confusion
  mxfdec: Add intra_only flag to MXFTrack
  mxfdec: fix Avid AirSpeed files being misinterpreted as OP1a
  mxfdec: truncate packets that extend past the next edit unit
  mxfdec: set pixel format for cdci picture formats
  mxfdec: detect uncomp pictures using essence container ul
  mxfdec: set track edit rate num/den in expected order
  x86/cpu: implement get/set_eflags using intrinsics
  x86/cpu: implement support for cpuid through intrinsics
  x86/cpu: implement support for xgetbv through intrinsics
  lavu: use intrinsics for emms on systems lacking inline asm support
  mem: Don't abort on av_malloc(0) in debug mode

Conflicts:
	configure
	libavformat/mxf.h
	libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-10 20:51:51 +02:00
Mans Rullgard e346176de9 x86: cpu: clean up check for cpuid instruction support 
This adds macros for accessing the EFLAGS register and uses
these instead of coding the entire check in inline asm.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-07-10 20:32:16 +02:00
Diego Biurrun 96890c001f configure: Change the rdtsc check to a linker check 
A compile-only test could succeed with an implicit function declaration.
Also move the check to the x86 section; rdtsc is x86-only.
 2012-07-10 20:26:23 +02:00
Jordi Ortiz 6e71c1202b rtsp: Make rtsp_open_transport_ctx() non-static 
This is required for the upcoming RTSP listen mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 21:21:19 +03:00
Jordi Ortiz 6bbb362218 rtsp: Move rtsp_read_close 
This avoids having to add forward declarations in the following
RTSP listen mode commit.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 21:20:34 +03:00
Jordi Ortiz 45b068580b rtsp: Parse the mode=receive/record parameter in transport lines 
We need to support the nonstandard mode=receive, for compatibility
with older libavformat clients.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 21:20:04 +03:00
Michael Niedermayer 84d902fb92 mpeg4videoenc: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-10 19:38:24 +02:00
Michael Niedermayer 43c609374a mpeg4videodec: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-10 19:38:24 +02:00
Nicolas George 0abab00303 dpx: invalid aspect ratio is 0/1, not 0/0. 2012-07-10 14:34:04 +02:00
Carl Eugen Hoyos acf0283925 Set default ffv1 coder to -1. 
Autoselect coder 1 instead of default coder if bits_per_raw_sample > 8.

Fixes ticket #1519.
 2012-07-10 14:32:55 +02:00
Carl Eugen Hoyos 4c4e125695 Cosmetics: Return AVERROR_INVALIDDATA from ffv1 encoder initialisation if invalid data was provided. 2012-07-10 14:32:55 +02:00
Carl Eugen Hoyos 08ed3e8bf4 Cosmetics: Move ffv1 encoder initialisation code. 2012-07-10 14:32:54 +02:00
Michael Niedermayer 71c689e83e dsputil: turn assert into if() as its possible to trigger with ffv1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-10 14:24:10 +02:00