Age | Commit message (Collapse) | Author |
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
|
|
|
|
* commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48':
lavc: make avpriv_flac_is_extradata_valid() private on the next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'c070a8751597e3aa1b443e88464da785d8966b14':
lavc: make avpriv_flac_parse_streaminfo() private on the next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
|
|
* commit '9325d88eba8038b3e2a4485e473a018410379e2d':
lavc: remove obsolete and disabled avpriv functions
Conflicts:
libavcodec/dv_profile.c
libavcodec/dv_profile.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0':
flac: make avpriv_flac_parse_block_header() inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362':
flacdec: do not overwrite a channel layout set by the caller
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This avoids all the ABI troubles associated with avpriv_.
Since this function is very small and does not depend on any tables,
making it inline should have no adverse effects.
|
|
The channel layout mask for non-standard layouts is typically stored at
the container level (as a vorbiscomment tag) for FLAC.
|
|
* commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c':
qdm2: Whitespace cosmetics
flac: use meaningful return values
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
Signed-off-by: Anton Khirnov <anton@khirnov.net>
|
|
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Also reorder some other #include when applicable.
|
|
* commit '50a65e7a540ce6747f81d6dbf6a602ad35be77ff': (24 commits)
vmdaudio: set channel layout
twinvq: validate sample rate code
twinvq: set channel layout
twinvq: validate that channels is not <= 0
truespeech: set channel layout
sipr: set channel layout
shorten: validate that the channel count in the header is not <= 0
ra288dec: set channel layout
ra144dec: set channel layout
qdm2: remove unneeded checks for channel count
qdm2: make sure channels is not <= 0 and set channel layout
qcelpdec: set channel layout
nellymoserdec: set channels to 1
libopencore-amr: set channel layout for amr-nb or if not set by the user
libilbc: set channel layout
dpcm: use AVCodecContext.channels instead of keeping a private copy
imc: set channels to 1 instead of validating it
gsmdec: always set channel layout and sample rate at initialization
libgsmdec: always set channel layout and sample rate at initialization
g726dec: do not validate sample rate
...
Conflicts:
libavcodec/dpcm.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Although the libFLAC decoder cannot handle such a change, it is allowed by the
spec and could potentially occur with live streams.
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
* qatar/master:
build: Fix Ogg demuxer dependencies
build: Fix FLAC demuxer dependencies
flac: Move flac functions shared between libraries to flac common code
build: Fix CAF demuxer dependencies
build: Fix MP2 muxer dependencies
build: Add missing build rules for the ISMV muxer
configure: Drop redundant mxf_d10 test dependency declaration
Support AAC encoding via the external library fdk-aac
libavcodec: Add more AAC profiles
dct/fft-test: use a replacement getopt() if the system has none present.
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This fixes a number of flac-related build dependencies.
|
|
* qatar/master: (29 commits)
lavfi: reclassify showfiltfmts as a TESTPROG
graph2dot: fix printf format specifier
swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32.
vp8: loopfilter >=sse2 functions need aligned stack on x86-32.
amr: remove shift out of the AMR_BIT() macro.
dsputilenc: group yasm and inline asm function pointer assignment.
mov: use forward declaration of a function instead of a table.
Clarify Doxygen comment for FF_API_* #defines.
configure: simplify get_version()
Create version.h headers for libraries that lack them
gitignore: Use full path instead of relative path to specify patterns
mpegvideo: remove VLAs
Add XTEA encryption support in libavutil
Add Blowfish encryption support in libavutil
eval: Add the isinf() function and tests for it
flacdec: move lpc filter to flacdsp
flacdec: split off channel decorrelation as flacdsp
avplay: Add an option for not limiting the input buffer size
FATE: add a test for WMA cover art.
FATE: add a test for apetag cover art
...
Conflicts:
.gitignore
configure
ffplay.c
libavcodec/Makefile
libavcodec/error_resilience.c
libavcodec/mpegvideo.c
libavcodec/ratecontrol.c
libavdevice/avdevice.h
libavfilter/Makefile
libavfilter/filtfmts.c
libavfilter/version.h
libavformat/mov.c
libavformat/version.h
libavutil/Makefile
libavutil/avutil.h
libavutil/version.h
libswscale/swscale.h
libswscale/x86/swscale_mmx.c
tests/fate/libavutil.mak
tests/lavfi-regression.sh
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
This reverts commit 2ef2496cd19eb833f4ad22a5051c11be80d09598.
Conflicts:
libavcodec/Makefile
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This reverts commit d2ee3c913d6fec3cb8c0c1b67347007c7cd604e1.
|
|
|
|
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Originally committed as revision 25913 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
to optionally silence the error messages.
Patch by Michael Chinen [mchinen at gmail]
Originally committed as revision 25912 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
ff_flac_decode_frame_header().
Patch by Michael Chinen [mchinen at gmail]
Originally committed as revision 25911 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Patch by Michael Chinen [mchinen at gmail]
Originally committed as revision 25910 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
forthcoming FLAC parser.
Patch by Michael Chinen [mchinen at gmail]
Originally committed as revision 25909 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
frame size and use the function in the FLAC decoder and FLAC encoder
Originally committed as revision 18092 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16735 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16723 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15177 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
fixes issue187
Originally committed as revision 14281 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 14280 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
this is needed to prevent loosing bitstream data with large metadata.
Originally committed as revision 14279 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
decorrelate and output somehing nonexistng.
Originally committed as revision 14278 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Fixes issue524
Originally committed as revision 14223 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 13947 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
|