ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-30 02:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,849 Commits 37 Branches 398 Tags 492 MiB
175cc378b3
Commit Graph

10 Commits

Author SHA1 Message Date
Michael Niedermayer
175cc378b3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Rudimentary IODs support.
  v410enc: fix output buffer size check
  v410enc: include correct headers
  fate: add -pix_fmt rgb48le to r210 test
  flvenc: Support muxing 16 kHz nellymoser
  configure: refactor list of programs into a variable
  fate: add r210 decoder test
  fate: split off Indeo FATE tests into their own file
  fate: split off ATRAC FATE tests into their own file
  fate: Add FATE tests for v410 encoder and decoder
  ARM: fix external symbol refs in rv40 asm
  westwood: Make sure audio header info is present when parsing audio packets
  libgsm: Reset the MS mode of GSM in the flush function
  libgsm: Set options on the right object
  ARM: dca: disable optimised decode_blockcodes() for old gcc

Conflicts:
	configure
	libavformat/movenc.c
	libavformat/movenc.h
	tests/fate2.mak
	tests/ref/acodec/alac
	tests/ref/vsynth1/mpeg4
	tests/ref/vsynth2/mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 01:23:15 +01:00
Alex Converse
d3b8bde2f1 movenc: Rudimentary IODs support. 2011-12-15 14:06:13 -08:00
Michael Niedermayer
901af94b69 movenc: Always write EDTS when we are able to. 
Inspired by a patch from Michael Root
Idea-by: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-07 05:21:37 +01:00
Michael Niedermayer
fc09bf57a6 movenc: Write file with minimal number of chunks for the given interleaving. 
Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-29 04:51:47 +01:00
John Brooks
2c4e08d893 riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 
The cbSize field should be included in all cases, even with PCM where
its value is ignored.

Fixes encoding PCM audio in Matroska for some players which insist on
a full WAVEFORMATEX structure for A_MS/ACM audio.

Since fate uses wav files for the audio test a larger number of tests
has changed checksums or shifted positions due to the 2 byte longer
wave header.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 13:28:58 +02:00
Anton Khirnov
7574cacbd5 movenc: create an alternate group for each media type 
Partially fixes bug 44.
 2011-09-17 08:42:30 +02:00
Måns Rullgård
c43d77c163 tiny_psnr: skip wav headers on input files 
The byte count printed excludes the header, and offsets are applied
after the the headers are skipped.

Reference files updated to reflect new output.  Some stddev/psnr values
have changed slightly due to headers no longer being compared.

Originally committed as revision 24143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-09 16:06:05 +00:00
Vitor Sessak
cb0067ec25 tiny_psnr: print max absolute difference between files 
Regression test reference updates are due to the extra output
from tiny_psnr.

Patch by Vitor Sessak

Originally committed as revision 24132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-09 00:40:37 +00:00
Måns Rullgård
cc3e2472f3 Place regression test output files in subdirs per family 
Originally committed as revision 22155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-02 21:41:52 +00:00
Måns Rullgård
c676895fd9 Separate audio-only tests so they are only run once 
Originally committed as revision 21556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-30 21:47:13 +00:00