ffmpeg/tests/ref
Michael Niedermayer fcc3909908 Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'
* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
  matroskadec: parse stereo mode on decoding

Conflicts:
	Changelog
	libavformat/matroska.c
	libavformat/matroskadec.c

See: 4c509fe305 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 23:48:23 +02:00
..
acodec
fate Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f' 2014-08-28 23:48:23 +02:00
lavf avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation 2014-08-09 05:05:09 +02:00
lavf-fate Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d' 2014-08-25 13:25:09 +02:00
seek avcodec/roqvideo: use JPEG color range 2014-07-06 23:34:58 +02:00
vsynth huffyuvdec: decode the last odd sample 2014-08-25 23:24:07 +02:00
vsynth1
vsynth2