RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
29,299 Commits 36 Branches 392 Tags 311 MiB
Commit Graph

13732 Commits

Author SHA1 Message Date
Carl Eugen Hoyos e499187f2e Fix compilation with libcelt on Apple OS X. 
Fixes ticket #97.
 2011-04-23 10:10:20 +02:00
Carl Eugen Hoyos 4b5c21757b Fix compilation after version bump. 2011-04-23 10:06:39 +02:00
Michael Niedermayer e16665bf72 Merge remote branch 'qatar/master' 
* qatar/master:
  Use av_log_ask_for_sample() to request samples from users.
  Make av_log_ask_for_sample() accept a variable number of arguments.
  vqavideo: We no longer need to ask for version 1 samples.
  aacdec: indentation cosmetics

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-23 01:09:43 +02:00
Diego Biurrun d9dee728b8 Use av_log_ask_for_sample() to request samples from users. 2011-04-22 20:12:39 +02:00
Diego Biurrun 44f566b79a Make av_log_ask_for_sample() accept a variable number of arguments. 2011-04-22 20:12:27 +02:00
Robert Leatherwood 03ac799128 Rm duplicated define for OPT_STR. 2011-04-22 20:10:26 +02:00
Diego Biurrun b2832c3904 vqavideo: We no longer need to ask for version 1 samples. 2011-04-22 20:02:24 +02:00
Michael Niedermayer cc0ac0d2cb rv10: set flags, Fixes Ticket90 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-22 16:02:23 +02:00
Young Han Lee 9978ed7d6c aacdec: indentation cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-04-22 14:47:47 +02:00
Michael Niedermayer 8772156be0 Merge remote branch 'qatar/master' 
* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
	libavcodec/h264.c
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-22 03:54:30 +02:00
Ronald S. Bultje 94f7451a3a Introduce slice threads flag. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-21 19:42:19 -04:00
Michael Niedermayer 89f903b3d5 AMV: Fix possibly exploitable crash. 
Reported-at: Thu, 21 Apr 2011 14:38:25 +0000
Reported-by: Dominic Chell <Dominic.Chell@ngssecure.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-21 22:44:55 +02:00
Michael Niedermayer 73a51e00a7 mjpeg: Detect overreads in mjpeg_decode_scan() and error out. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-21 22:44:55 +02:00
Diego Biurrun 70fb031ce2 Use av_log_ask_for_sample() where appropriate. 2011-04-21 19:58:54 +02:00
Baptiste Coudurier 20a160484f In libx264 wrapper, detect default settings and use medium profile to avoid failure. 2011-04-21 09:01:35 -07:00
Anton Khirnov 65af48b559 lavc: provide deprecated avcodec_thread_init until next major version 
It was deprecated only recently.
 2011-04-21 07:22:23 +02:00
Anton Khirnov 095290f9a4 lavc: provide the opt.h header until the next bump 
AVOptions were moved to libavutil only recently.
 2011-04-21 07:14:51 +02:00
Baptiste Coudurier 2c18893a91 In libx264 wrapper, correctly support 2pass log filename option. 2011-04-20 15:46:40 -07:00
Nicolas George 89451dd6e4 Xiph CELT/Opus decoder using libcelt. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
 2011-04-20 10:46:30 +02:00
Carl Eugen Hoyos ddb00ad1d8 Move the info union to the end of the vdpau_render_state struct. 2011-04-20 09:44:08 +02:00
Michael Niedermayer efb5fa79f5 Merge remote branch 'qatar/master' 
* qatar/master: (37 commits)
  In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
  lavc: remove reference to opt.h from Makefile.
  prefer avio_check() over url_exist()
  avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
  lavu: remove misc disabled cruft
  lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED  lavu: remove FF_API_OLD_EVAL_NAMES cruft
  lavc: remove misc disabled cruft.
  lavc: remove the FF_API_INOFFICIAL cruft.
  lavc: remove the FF_API_SET_STRING_OLD cruft.
  lavc: remove the FF_API_USE_LPC cruft.
  lavc: remove the FF_API_SUBTITLE_OLD cruft.
  lavc: remove the FF_API_VIDEO_OLD cruft.
  lavc: remove the FF_API_AUDIO_OLD cruft.
  lavc: remove the FF_API_OPT_SHOW cruft.
  lavc: remove the FF_API_MM_FLAGS cruft.
  lavf: remove misc disabled cruft.
  lavf: remove FF_API_INDEX_BUILT cruft
  lavf: remove FF_API_URL_CLASS cruft.
  lavf: remove FF_API_SYMVER cruft
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-20 04:48:23 +02:00
Baptiste Coudurier f92b0084c0 In libx264 wrapper, add -level specific option. 2011-04-19 16:12:13 -07:00
Baptiste Coudurier 37c0a443f9 Fix libx264 fastfirstpass, move apply_fastfirstpass after user customized options. 2011-04-19 15:25:07 -07:00
Baptiste Coudurier 46f83e5b3c In libx264 wrapper, do not set pic quality if no frame is output, avoids 
uninitialized reads.
 2011-04-19 13:31:27 -07:00
Justin Ruggles 31d76ec288 In avcodec_open(), set return code to an error value only when an error occurs 
instead of unconditionally at the start of the function.

This fixes a bug where a successful call to ff_thread_init() masks errors that
occur after that point in the function.  It also makes future bugs like this
less likely since the error code is now set near to the point in the code
where the error is found.
 2011-04-19 14:10:03 -04:00
Anton Khirnov cda7aa9eba lavc: remove reference to opt.h from Makefile. 
Fixes make install after 3453a231a6.
 2011-04-19 19:50:23 +02:00
Anton Khirnov 3453a231a6 lavc: remove misc disabled cruft. 2011-04-19 19:01:22 +02:00
Anton Khirnov 251cf997cf lavc: remove the FF_API_INOFFICIAL cruft. 2011-04-19 18:41:32 +02:00
Anton Khirnov 41d0eb1c81 lavc: remove the FF_API_SET_STRING_OLD cruft. 2011-04-19 18:41:00 +02:00
Anton Khirnov 01a4259b8d lavc: remove the FF_API_USE_LPC cruft. 2011-04-19 18:40:35 +02:00
Anton Khirnov db4d3a7421 lavc: remove the FF_API_SUBTITLE_OLD cruft. 2011-04-19 18:39:40 +02:00
Anton Khirnov e89e5afdd0 lavc: remove the FF_API_VIDEO_OLD cruft. 2011-04-19 18:37:21 +02:00
Anton Khirnov 9b4f1cdb6a lavc: remove the FF_API_AUDIO_OLD cruft. 2011-04-19 18:37:03 +02:00
Anton Khirnov 20d33ee8b1 lavc: remove the FF_API_OPT_SHOW cruft. 2011-04-19 18:36:15 +02:00
Anton Khirnov 42420e7b94 lavc: remove the FF_API_MM_FLAGS cruft. 2011-04-19 18:35:56 +02:00
Diego Biurrun 151cd4f982 pcm: Add const to cast in ENCODE macro. 
This fixes a lot of warnings of the sort:
libavcodec/pcm.c:105: warning: cast discards qualifiers from pointer target type
 2011-04-19 16:18:59 +02:00
Nicolas George e61b83d29e Ogg: add support for Xiph's CELT (Opus) codec. 
This patch also introduces CODEC_ID_CELT.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
 2011-04-19 15:49:32 +02:00
Peter Belkner 39e69d0b88 32bit libmp3lame support. 2011-04-19 13:25:05 +02:00
Peter Belkner 22fa406f38 Check avcodec_alloc_frame() failure. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-19 13:25:05 +02:00
Gavin Kinsey 25347c880f Fix compilation.for iOS ARMv7. 2011-04-19 10:16:07 +02:00
Carl Eugen Hoyos 9b53bb8b3b Only ask once in the code for a TrueHD sample with strange channel layout. 2011-04-19 03:23:46 +02:00
Carl Eugen Hoyos d3f126df4b Also set the MLP/TrueHD channel layout in the decoder. 
Applications might not use the parser,
 2011-04-19 03:18:08 +02:00
Carl Eugen Hoyos 280a789fe2 Make MLP/TrueHD channel layout functions visible to the decoder. 2011-04-19 03:09:11 +02:00
Michael Niedermayer a3040715e1 Merge commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b' 
* commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b':
Not pulled:  Replace mplayerhq.hu URLs by libav.org.
  asfdec: Remove dead code from asf_read_close().
  ptx: Use av_log_ask_for_sample() where appropriate.

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-19 02:08:35 +02:00
Luca Barbato facc48f157 libvo-aacenc,libvo-amrwbenc}: fix api usage 
Use the correct error codes and format identifier.
 2011-04-18 22:21:13 +02:00
Bill Pringlemeir fccff6e83a Allow h264pred_init_arm.c to compile. 
SOB: Bill Pringlemeir <bpringlemeir@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-18 20:40:14 +02:00
Peter Ross 62931e11d6 anm decoder: move buffer allocation from decode_init() to decode_frame() 
This permits playback in ffplay when libavfilter is enabled.

Resolves ticket #60

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-18 20:40:14 +02:00
Anton Khirnov 139f3ac42d Bump major versions of all libraries. 
They've accumulated enough new APIs and corresponding deprecated cruft.

This breaks API and ABI.
 2011-04-18 20:19:47 +02:00
Diego Biurrun f0a41afd8a Replace mplayerhq.hu URLs by libav.org. 2011-04-18 18:23:16 +02:00
Diego Biurrun 259a3e70ed ptx: Use av_log_ask_for_sample() where appropriate. 2011-04-18 09:41:02 +02:00