RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
61,250 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

5 Commits

Author SHA1 Message Date
Michael Niedermayer dd4237f87d Merge commit '5312818524484a995433b986a2a7a6602572d4db' 
* commit '5312818524484a995433b986a2a7a6602572d4db':
  atrac3plus: Make initialization dependant on channel count rather than channel map

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-31 14:53:06 +01:00
Jan Ekström 5312818524 atrac3plus: Make initialization dependant on channel count rather than channel map 
Makes it easier to recreate an AVCodecContext for ATRAC3+ decoding,
which is needed in multimedia frameworks, as well as in general cases
where demuxing and decoding are separate entities.
 2014-01-31 11:09:10 +01:00
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
Maxim Polijakowski e6f0bb6527 ATRAC3+ decoder 
Cleanup by Diego Biurrun.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2014-01-09 19:33:07 +01:00
Maxim Poliakovski 2e1fb96af3 ATRAC+ decoder 
Cleanup by Diego Biurrun.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-29 01:11:16 +01:00