ffmpeg/libavcodec
Michael Niedermayer 6c180b35c4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpegvideo_enc: don't use deprecated avcodec_encode_video().
  cmdutils: refactor -codecs option.
  avconv: make -shortest a per-output file option.
  lavc: add avcodec_descriptor_get_by_name().
  lavc: add const to AVCodec* function parameters.
  swf(dec): replace CODEC_ID with AV_CODEC_ID
  dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
  rtmpdh: Do not generate the same private key every time when using libnettle
  rtp: remove ff_rtp_get_rtcp_file_handle().
  rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle()
  avio: add (ff)url_get_multi_file_handle() for getting more than one fd
  h264: vdpau: fix crash with unsupported colorspace
  amrwbdec: Decode the fr_quality bit properly

Conflicts:
	Changelog
	cmdutils.c
	cmdutils_common_opts.h
	doc/ffmpeg.texi
	ffmpeg.c
	ffmpeg.h
	ffmpeg_opt.c
	libavcodec/h264.c
	libavcodec/options.c
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-18 15:20:32 +02:00
..
2012-04-22 22:26:55 +02:00
2012-07-11 04:04:29 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-07-29 22:02:46 +02:00
2012-06-03 01:53:36 +02:00
2012-08-09 00:02:05 +00:00
2012-08-15 22:32:06 +03:00
2012-05-08 00:25:25 +02:00
2012-08-14 18:58:49 +02:00
2012-07-07 12:33:51 +02:00
2012-08-08 01:14:18 +02:00
2012-08-12 15:21:15 -04:00
2012-08-07 23:57:21 +02:00
2012-05-18 23:34:11 +02:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2012-08-09 11:22:11 +02:00
2012-08-15 22:32:06 +03:00
2012-03-13 01:14:04 +01:00
2012-08-15 22:32:06 +03:00
2012-07-19 18:44:46 +02:00
2012-02-01 04:43:06 +01:00
2012-07-26 16:33:17 +02:00
2012-06-07 21:07:17 +02:00
2012-08-13 04:58:15 +02:00
2012-07-10 02:17:53 +02:00
2012-07-10 02:17:52 +02:00
2012-07-25 21:35:30 +02:00
2012-06-10 23:27:17 +02:00
2012-05-18 23:34:11 +02:00
2012-02-14 01:22:38 +01:00
2012-04-22 22:26:55 +02:00
2012-07-22 05:18:01 +02:00
2012-08-09 10:50:27 +02:00
2012-08-07 22:56:35 +00:00
2012-05-18 23:34:11 +02:00
2012-06-28 00:07:22 +02:00
2012-01-07 00:11:43 +01:00
2011-12-17 05:04:56 +01:00
2012-08-15 05:29:28 +02:00
2012-06-17 17:09:34 +02:00
2012-07-05 02:54:34 +00:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-07-29 22:02:46 +02:00
2012-06-06 21:18:14 +02:00
2012-03-19 18:46:34 +01:00
2012-06-10 23:36:22 +02:00
2012-06-24 20:18:00 +02:00
2012-08-15 22:32:06 +03:00
2012-06-21 01:30:16 +00:00
2012-03-07 10:29:52 -08:00
2012-08-12 05:32:07 +02:00
2012-08-11 05:32:16 +02:00
2012-07-17 01:23:35 +00:00
2012-08-18 09:52:15 +02:00
2012-08-14 21:22:20 +02:00
2012-03-13 01:14:04 +01:00
2012-06-29 20:43:30 +02:00