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

32 Commits

Author SHA1 Message Date
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
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
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
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
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
Michael Niedermayer 2d2b5a1421 10l, commit that should have been stashed into the merge. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-17 23:59:00 +02:00
Diego Biurrun 6001dad6e2 Replace more FFmpeg references by Libav. 2011-04-17 19:31:49 +02:00
Kostya Shishkov 4de339e219 introduce side information for AVPacket 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-04-15 18:01:53 +02:00
Martin Storsjö 302152d40b libavcodec: Bump micro after adding the dtx AVOptions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-04-14 09:34:26 +03:00
Anton Khirnov c776732712 lavc: postpone removal of request_channels 
No decoder uses the supposed replacement, request_channel_layout, yet.
 2011-04-13 13:50:17 +02:00
Anton Khirnov d6ead39ee7 lavc: postpone removal of audioconvert and sample_fmt wrappers 
Those were moved to libavutil only recently.
 2011-04-13 13:50:17 +02:00
Martin Storsjö f502ff3f61 Add support for AMR-WB encoding via libvo-amrwbenc 
The wrapper code is based on the libamr wrapper removed in SVN rev 19365.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-04-11 14:55:53 +03:00
Martin Storsjö d89e738a0c Add an AAC encoder by using the libvo-aacenc library 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-04-11 14:55:51 +03:00
Alberto Delmás 768c525114 Parse sprite data for WMVP and WVP2, and decode sprites for the latter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-10 10:07:49 +02:00
Anton Khirnov 9f5ddd1e46 lavc: add a FF_API_REQUEST_CHANNELS deprecation macro 
And hide request_channels AVOption under it.
 2011-04-07 18:11:24 +02:00
Anton Khirnov 4e3945fd28 lavc: deprecate AVCodecContext.antialias_algo 
It's been unused since mp3float decoder was added.
 2011-04-03 08:43:11 +02:00
Anton Khirnov 4a49d2d59c lavc: mark mb_qmin/mb_qmax for removal on next major bump. 
They've been unused and deprecated for about five years.
 2011-04-03 08:43:09 +02:00
Anton Khirnov ed5fcd60b2 lavc: deprecate rate_emu 
It's not used anywhere and apparrently hasn't been for a very long time.
 2011-04-02 16:18:37 +02:00
Anton Khirnov 8ed2ae09a2 lavc: mark hurry_up for removal on next major bump 
It has been deprecated for about five years, skip_idct/skip_frame should
be used instead.
 2011-04-02 16:17:24 +02:00
anatoly ce02f9becf Add MxPEG decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-03-30 07:18:34 +02:00
Kostya Shishkov 42315dabce Chronomaster DFA decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-03-28 16:55:03 +02:00
Justin Ruggles 34b47d7cbc Add audio_service_type field to AVCodecContext for encoding and reporting 
of the service type in the audio bitstream.
 2011-03-25 16:51:53 -04:00
Anton Khirnov 3dd851c46b lavc: move the version macros to a new installed header. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-22 21:48:33 -04:00