Age | Commit message (Collapse) | Author |
|
* commit '9cd4bc41760f8ad879e248920eacbe1e7757152c':
ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* qatar/master:
eac3: cosmetics, re-indent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'ade75fb811500f3e3f284737f123938d83be728f':
(e)ac3: clip surround mix level indexes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f':
(e)ac3: parse and store the Lt/Rt and LFE mix levels.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '1f604f96ea70503caa642f68a85be6074a5b3f46':
ac3: set default matrix encoding modes in parse_frame_header.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
Values 0-2 are reserved, 3 (-1.5dB) should be used instead.
|
|
|
|
Deduplicates some code.
|
|
* commit '13345fc1f86fc3615789e196d5a339c1c27c9068':
(e)ac3: parse and store the Dolby Surround, Surround EX and Headphone mode flags.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
flags.
|
|
* qatar/master:
avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()
Conflicts:
libavcodec/aacsbr.c
libavcodec/amrnbdec.c
libavcodec/takdec.c
libavcodec/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
|
|
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
fate: Declare avcodec/avformat deps in the respective Makefile snippets
fate: Add dependencies for WMA and WavPack tests
Improve wording and spelling of av_log_missing_feature messages.
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
Conflicts:
libavcodec/aacsbr.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
rtpdec_xiph: fix function return type
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
mpegvideo: remove write-only variable
Use proper return values in case of missing features
fate: add avstring test
rangecoder-test: Set error message log level to error, instead of debug
Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
Patch attached.
From 2d4094fc0dcb4ccd0735eb7e1719e228ebb56bb9 Mon Sep 17 00:00:00 2001
From: Lou Logan <lou@lrcd.com>
Date: Mon, 12 Mar 2012 14:13:44 -0800
Subject: [PATCH] cosmetics: fix some typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* qatar/master: (26 commits)
eac3dec: replace undefined 1<<31 with INT32_MIN in noise generation
yadif: specify array size outside DECLARE_ALIGNED
prores: specify array size outside DECLARE_ALIGNED brackets.
WavPack demuxer: set packet duration
tta: use skip_bits_long()
mxfdec: Ignore the last entry in Avid's index table segments
mxfdec: Sanity-check SampleRate
mxfdec: Handle small EditUnitByteCount
mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a
mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows
mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()
mxfdec: Sanity check PreviousPartition
mxfdec: Never seek back in local sets and KLVs
mxfdec: Move the current_partition check inside mxf_read_header()
mxfdec: Fix infinite loop in mxf_packet_timestamps()
mxfdec: Check eof_reached in mxf_read_local_tags()
mxfdec: Check for NULL component
mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
mxfdec: Make sure x < index_table->nb_ptses
build: Add missing directories to DIRS declarations.
...
Conflicts:
doc/build_system.txt
doc/fate.texi
libavfilter/x86/yadif_template.c
libavformat/mxfdec.c
libavutil/Makefile
tests/fate/audio.mak
tests/fate/prores.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/ref/fate/bethsoft-vid
tests/ref/fate/cscd
tests/ref/fate/dfa4
tests/ref/fate/nuv
tests/ref/fate/vp8-sign-bias
tests/ref/fate/wmv8-drm
tests/ref/lavf/gxf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* qatar/master:
Remove h264_lowres_idct_put/add functions
Remove snow/dwt test program
h264: remove some disabled code
Fix incorrect max_lowres values
matroskadec: fix integer underflow if header length < probe length.
cosmetics: indentation
eac3enc: use frame exponent strategy when applicable.
cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder.
dsputil: fix ff_check_alignment()
Conflicts:
libavcodec/Makefile
libavcodec/h264idct_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
be used in the E-AC-3 encoder.
|
|
* newdev/master:
mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
Use audio_service_type to set stream disposition.
Add APIchanges entry for audio_service_type.
Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
configure: in check_ld, place new -l flags before existing ones
support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
doc: update build system documentation
aacenc: indentation
aacenc: fix the side calculation in search_for_ms
vp8.c: rename EDGE_* to VP8_EDGE_*.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vp8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
and decoder, and vice-versa for the AC-3 encoder.
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Original patch by Justin, updated and resubmitted by
Christophe Gisquet, christophe D gisquet A gmail
Originally committed as revision 22734 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 19501 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 19294 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
multiplication in GAQ mantissa ramapping.
Originally committed as revision 18941 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18890 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
decoded when the gain value is 2 or 4.
Originally committed as revision 18889 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18888 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
dequantization 24-bit in a separate commit.
Originally committed as revision 18887 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
simpler and also fixes a bug in GAQ dequantization.
Originally committed as revision 18860 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18021 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
will follow
Patch by Alex Converse ( alex converse gmail com )
Originally committed as revision 16479 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
to ff_log_missing_feature.
Originally committed as revision 16037 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16020 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16019 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15818 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15812 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15101 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15099 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15092 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15090 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15067 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 14936 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 14912 to svn://svn.ffmpeg.org/ffmpeg/trunk
|