1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/tests/ref/acodec
Michael Niedermayer 1e49439f04 Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'
* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18 21:31:51 +02:00
..
adpcm_ima_qt
adpcm-adx
adpcm-ima_qt
adpcm-ima_wav
adpcm-ms
adpcm-swf
adpcm-yamaha
alac
flac
g723_1
mp2
mp2fixed
pcm-alaw
pcm-f32be
pcm-f32le
pcm-f64be
pcm-f64le
pcm-mulaw
pcm-s8
pcm-s8_planar Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-s16be
pcm-s16be_planar Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-s16le
pcm-s16le_planar Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-s24be
pcm-s24le
pcm-s24le_planar Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-s32be
pcm-s32le
pcm-s32le_planar Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-u8
pcm-u16be Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-u16le Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-u24be Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-u24le Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-u32be Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-u32le Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
roqaudio