virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
1e49439f04
FFmpeg/tests/ref/acodec
History
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 Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6' 2012-12-03 02:33:27 +01:00
adpcm-adx ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
adpcm-ima_qt ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
adpcm-ima_wav ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
adpcm-ms ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
adpcm-swf ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
adpcm-yamaha ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
alac ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
flac ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
g723_1 ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
mp2 ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
mp2fixed ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-alaw ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-f32be ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-f32le ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-f64be ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-f64le ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-mulaw ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-s8 ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-s8_planar Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-s16be ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-s16be_planar Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-s16le ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-s16le_planar Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-s24be ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-s24le ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-s24le_planar Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-s32be ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-s32le ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
pcm-s32le_planar Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
pcm-u8 ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
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 ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00