1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer 7c1aba4f01 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  fate: allow testing with libavfilter disabled
  x86: XOP/FMA4 CPU detection support
  ws_snd: misc cosmetic clean-ups
  ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
  ws_snd: use memcpy() and memset() instead of loops
  ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
  ws_snd: make sure number of channels is 1
  ws_snd: add some checks to prevent buffer overread or overwrite.
  ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
  flacdec: fix buffer size checking in get_metadata_size()
  rtp: Simplify ff_rtp_get_payload_type
  rtpenc: Add a payload type private option
  rtp: Correct ff_rtp_get_payload_type documentation
  avconv: replace all fprintf() by av_log().
  avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
  cmdutils: replace fprintf() by av_log()
  avtools: parse loglevel before all the other options.
  oggdec: add support for Xiph's CELT codec
  sol: return error if av_get_packet() fails.
  cosmetics: reindent and pretty-print
  ...

Conflicts:
	avconv.c
	cmdutils.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/oggparsecelt.c
	libavformat/utils.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 02:14:37 +02:00
..
2011-06-02 20:06:00 +01:00
2011-09-23 22:41:10 +02:00
2011-04-28 04:26:01 +02:00
2011-04-17 23:43:54 +02:00
2011-08-12 17:20:57 +02:00
2011-09-26 02:28:21 +02:00
2011-05-05 03:30:24 +02:00
2011-04-11 23:39:12 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-05-21 02:31:27 +02:00
2011-09-15 13:23:04 -07:00
2011-09-16 05:53:32 +02:00
2011-09-16 05:53:14 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-06-02 20:06:00 +01:00
2011-04-26 22:06:13 +02:00
2011-08-15 00:39:55 +02:00
2011-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +02:00
2011-04-27 03:51:04 +02:00
2011-04-29 18:31:17 +02:00
2011-09-24 21:11:01 +02:00
2011-09-25 21:17:22 +02:00
2011-09-25 21:16:55 +02:00
2011-04-25 00:20:03 +02:00
2011-04-25 00:20:03 +02:00
2011-08-30 05:41:44 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-05-11 05:47:02 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-04-27 03:51:04 +02:00
2011-09-24 06:01:45 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-07-21 18:10:58 +01:00
2011-09-08 05:34:17 +02:00
2011-09-15 13:23:04 -07:00
2011-09-26 02:28:21 +02:00
2011-09-11 04:07:08 +02:00
2011-09-26 18:53:12 +02:00
2011-05-11 05:47:02 +02:00
2011-09-26 02:28:21 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-21 13:48:10 +02:00
2011-09-07 01:10:14 +02:00
2011-05-08 01:33:40 +02:00
2011-09-23 01:12:29 +02:00
2011-08-01 01:26:55 +02:00
2011-09-17 21:55:11 +02:00
2011-09-22 10:35:06 +03:00
2011-09-17 21:55:11 +02:00
2011-09-14 11:13:54 +03:00
2011-09-17 21:55:11 +02:00
2011-09-15 13:23:04 -07:00
2011-09-07 12:16:15 +02:00
2011-09-11 12:54:47 +02:00
2011-09-01 02:38:56 +02:00
2011-05-13 04:40:40 +02:00
2011-09-10 22:10:00 +02:00
2011-08-15 00:39:55 +02:00
2011-04-27 03:51:04 +02:00
2011-04-20 04:48:23 +02:00