ffmpeg/libavcodec
Michael Niedermayer f8ae3a2108 Merge remote branch 'qatar/master'
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
  ffmpeg: fix -aspect cli option
  Restructure video filter implementation in ffmpeg.c.
  ffplay: remove audio_write_get_buf_size() forward declaration
  lavfi: print key-frame and picture type information in ff_dlog_ref()
  mathops: remove ancient confusing comment
  cws2fws: Improve error message wording.
  tools: Check the return value of write().
  mpegaudio: move OUT_FMT macro to mpegaudiodec.c
  mpegaudio: remove OUT_MIN/MAX macros
  Add missing #includes to mp3_header_(de)compress bsf
  dct: fix indentation
  dct: bypass table allocation for DCT_II of size 32
  h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
  Remove unused header mpegaudio3.h.

Conflicts:
	ffmpeg.c
	libavcodec/mpegaudio.h
	libavcodec/mpegaudio3.h
	libavfilter/avfilter.c

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