1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
Michael Niedermayer 61d0a6dd95 Merge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'
* commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a':
  aac: Simplify decode_mid_side_stereo

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 21:29:48 +01:00
..
2014-11-30 12:56:02 +01:00
2014-11-21 17:13:56 +01:00
2014-12-01 00:31:06 +01:00
2014-11-21 17:13:56 +01:00
2014-11-26 04:11:16 +01:00
2014-11-25 02:00:06 +00:00
2014-11-21 17:13:56 +01:00
2014-11-21 12:37:50 +00:00
2014-11-25 02:00:27 +01:00
2014-12-01 00:31:06 +01:00
2014-11-21 17:13:56 +01:00
2014-11-23 06:51:18 +01:00