Files
ffmpeg-rockchip/libavcodec
Michael Niedermayer 268d931724 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ATRAC3+ decoder

Conflicts:
	Changelog
	configure
	libavcodec/atrac3plus.c
	libavcodec/atrac3plus.h
	libavcodec/atrac3plus_data.h
	libavcodec/atrac3plusdec.c
	libavcodec/atrac3plusdsp.c
	libavcodec/version.h

See: 2e1fb96af3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09 20:58:03 +01:00
..
2014-01-09 19:33:07 +01:00
2014-01-09 19:33:07 +01:00
2013-12-15 16:53:32 +01:00
2014-01-01 02:57:56 +01:00
2013-12-22 22:03:47 +01:00
2013-12-28 18:19:46 +01:00
2013-11-26 13:22:01 +01:00
2013-11-21 20:53:06 +01:00
2014-01-02 22:07:09 +01:00
2014-01-09 19:33:07 +01:00
2013-11-21 20:57:20 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00
2013-12-31 12:19:59 +01:00
2013-12-31 12:19:59 +01:00
2013-12-18 18:15:15 +01:00
2013-12-18 22:15:32 +01:00
2013-12-09 08:41:20 +01:00
2013-12-09 08:41:20 +01:00
2014-01-04 04:16:46 +01:00
2013-12-10 16:18:51 +01:00
2013-12-22 14:59:31 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00