Files
FFmpeg/libavcodec
Michael Niedermayer 9023de342f Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'
* commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea':
  Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer
  G.723.1 demuxer and decoder
  Add a shift parameter to celp_lp_synthesis_filter()
  libopenjpeg: K&R formatting cosmetics
  yadif: use emms_c() instead of inline assembly for emms invocations.
  ac3: don't use different names for option tables in the template file.
  lavfi: use const for AVFilterPad declarations in all filters.
  adpcm: don't duplicate identical AVSampleFmt array for each encoder.
  configure: cosmetics: Group test dependencies together
  configure: add more passthrough flags in tms470 filter
  configure: move flag filtering functions out of if/else blocks

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/ac3enc_fixed.c
	libavcodec/allcodecs.c
	libavcodec/eac3enc.c
	libavcodec/g723_1.c
	libavcodec/g723_1_data.h
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/v210dec.h
	libavcodec/version.h
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_settb.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_format.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hflip.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_pixdesctest.c
	libavfilter/vf_scale.c
	libavfilter/vf_select.c
	libavfilter/vf_setpts.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_slicify.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_color.c
	libavfilter/vsrc_testsrc.c
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/g723_1.c
	libavformat/version.h

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