1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavfilter
Michael Niedermayer 15a0fb58a3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  utvideodec: Fix single symbol mode decoding
  truespeech: drop useless casts
  libavcodec: drop bogus dependencies from mpc[78] and qdm2
  mpegaudio: move ff_mpa_enwindow to a separate file
  AVOptions: store defaults for INT64 options in int64 union member.

Conflicts:
	libavcodec/Makefile
	libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-24 15:00:39 +02:00
..
2012-08-20 23:03:06 +02:00
2012-03-17 11:21:49 +01:00
2012-08-17 18:26:39 +02:00
2012-07-19 18:44:46 +02:00
2012-08-22 19:04:30 +02:00
2012-07-03 01:32:16 +02:00
2012-08-17 18:26:40 +02:00
2012-08-17 18:26:40 +02:00
2012-08-18 12:13:34 +02:00
2012-08-17 18:26:41 +02:00
2012-08-22 19:04:30 +02:00
2012-08-17 18:26:42 +02:00
2012-08-17 18:26:42 +02:00