wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
FFmpeg/tests/ref/acodec
History
Michael Niedermayer 568e9062bd Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 
* qatar/release/0.8: (154 commits)
  Update Changelog for the 0.8.1 Release
  dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2
  dca: don't use av_clip_uintp2().
  snow: check reference frame indices.
  snow: reject unsupported chroma shifts.
  xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
  h264: increase reference poc list from 16 to 32.
  h264: stricter reference limit enforcement.
  h264: improve parsing of broken AVC SPS
  Replace computations of remaining bits with calls to get_bits_left().
  png: convert to bytestream2 API.
  roqvideo: convert to bytestream2 API.
  smc: port to bytestream2 API.
  tgq: convert to bytestream2 API.
  algmm: convert to bytestream2 API.
  jvdec: unbreak video decoding
  h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
  libx264: add 'stats' private option for setting 2pass stats filename.
  libx264: fix help text for slice-max-size option.
  avconv: reindent
  ...

Conflicts:
	Changelog
	RELEASE
	avconv.c
	doc/APIchanges
	ffplay.c
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/alsdec.c
	libavcodec/atrac3.c
	libavcodec/avcodec.h
	libavcodec/dvdata.c
	libavcodec/fraps.c
	libavcodec/golomb.h
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_direct.c
	libavcodec/h264_parser.c
	libavcodec/h264_ps.c
	libavcodec/h264idct_template.c
	libavcodec/indeo3.c
	libavcodec/kgv1dec.c
	libavcodec/kmvc.c
	libavcodec/mjpegbdec.c
	libavcodec/mmvideo.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo.h
	libavcodec/options.c
	libavcodec/pngdec.c
	libavcodec/roqvideodec.c
	libavcodec/shorten.c
	libavcodec/svq3.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavcodec/xxan.c
	libavformat/Makefile
	libavformat/asfdec.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/nsvdec.c
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h
	libavutil/error.c
	libavutil/error.h
	libswscale/swscale.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/ref/acodec/g722

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-16 09:01:08 +01:00
..
ac3_fixed ac3enc: Add channel coupling support for the fixed-point AC-3 encoder. 2011-09-05 10:09:44 -04:00
adpcm_adx fate: add ADX encoding/decoding test 2012-01-03 18:47:42 -05:00
adpcm_ima_qt riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
adpcm_ima_wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
adpcm_ms riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
adpcm_swf riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
adpcm_yam riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
alac Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
aref riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
flac Replace vendor string in Ogg and FLAC muxers. 2011-11-02 10:43:39 +01:00
g722 Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 2012-03-16 09:01:08 +01:00
g723_1 Merge remote-tracking branch 'qatar/master' 2011-10-14 22:24:00 +02:00
g726 Merge remote-tracking branch 'qatar/master' 2011-10-14 22:24:00 +02:00
mp2 riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
pcm_alaw fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_f32be fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_f32le fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_f64be fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_f64le fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_mulaw fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_s8 Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs" 2012-01-22 23:40:24 +01:00
pcm_s16be movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
pcm_s16le fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_s24be movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
pcm_s24daud Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
pcm_s24le fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_s32be movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
pcm_s32le fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_u8 fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
wmav1 wmaenc: fix m/s stereo encoding for the first frame 2012-03-04 21:26:29 +01:00
wmav2 wmaenc: fix m/s stereo encoding for the first frame 2012-03-04 21:26:29 +01:00