1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer 795b911bd8 Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'
* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f':
  ape: 3.80-3.92 decoding support
  h264: Remove an unused variable

Conflicts:
	libavcodec/apedec.c
	libavformat/ape.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26 13:14:16 +01:00
..
2013-03-18 02:10:10 +01:00
2013-03-19 13:28:29 +01:00
2013-03-22 14:57:56 +01:00
2013-03-22 14:57:56 +01:00
2013-03-22 14:57:56 +01:00
2013-03-15 21:09:36 +01:00
2013-03-15 04:39:41 +01:00
2013-03-21 14:48:56 +01:00
2013-03-22 18:07:26 +01:00
2013-03-25 15:00:05 +02:00
2013-03-22 14:57:56 +01:00
2013-03-24 04:09:04 +01:00
2013-03-15 14:38:09 +01:00
2013-03-15 14:38:09 +01:00
2013-03-21 16:01:53 +01:00
2013-03-20 03:37:48 +01:00
2013-03-21 19:56:19 +01:00
2013-03-22 14:57:56 +01:00
2013-03-19 15:26:23 +01:00
2013-03-25 15:14:20 +01:00