FFmpeg/libavcodec
Michael Niedermayer b04b021005 Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'
* commit 'ae5a8dca675ee544178225256893e679b750cb63':
  hap: Fix slice size computation

Conflicts:
	libavcodec/hapdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 12:35:10 +02:00
..
2015-07-22 23:23:29 +02:00
2015-07-20 15:06:50 +01:00
2015-07-22 21:04:17 +02:00
2015-07-20 15:06:50 +01:00
2015-06-19 13:57:36 +02:00
2015-07-22 16:15:53 +02:00
2015-07-22 16:15:53 +02:00
2015-06-28 14:51:07 +02:00
2015-06-24 15:09:31 -07:00
2015-07-22 21:04:17 +02:00
2015-06-17 20:11:43 +02:00
2015-07-01 20:30:48 +02:00
2015-06-26 23:35:26 +02:00
2015-07-22 23:23:29 +02:00
2015-07-10 16:21:50 +02:00
2015-07-22 21:04:17 +02:00
2015-07-20 15:06:50 +01:00
2015-07-20 15:06:50 +01:00