Michael Niedermayer ae215e2b42 Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77' ...

* commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77':
  mp3: enable packed main_data decoding in MP4

Conflicts:
	libavcodec/mpegaudiodec_template.c

Only the parts needed to support the available sample are merged
the remaining error checks are left in place

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-06-21 20:32:06 +02:00

..

fate

Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'

2015-06-21 20:32:06 +02:00

filtergraphs

…

ref

avcodec/jpeg2000dwt: Fix value of F_LFTG_X and I_LFTG_X

2015-06-21 19:25:35 +02:00

audiogen.c

…

base64.c

…

copycooker.sh

…

fate-run.sh

fate: Test pullup and fieldmatch with 5 instead of 1 frame

2015-05-12 12:29:47 +02:00

fate-valgrind.supp

…

fate.sh

…

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

…

Makefile

…

md5.sh

…

reference.pnm

…

regression-funcs.sh

…

rotozoom.c

…

test.ffmeta

…

tiny_psnr.c

…

tiny_ssim.c

…

utils.c

…

videogen.c

…