* commit '80521c1997a23e148edf89e11b939ab8646297ca':
build: allow targets to specify extra objects to link with executables
swscale: avoid pointless use of compound literals
libm: add fallbacks for various single-precision functions
network: use getservbyport() only if available
network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN
Include sys/time.h before sys/resource.h
Conflicts:
Makefile
configure
libavutil/libm.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
In avcodec_open2(), apply consistent casing and avoid "or" conjunction at
the beginning of a sentence, in the messages issued in case of
experimental codec usage.
Allow to specify a filename where to put the filtergraph description.
This is useful to override limitations or glitches of particular shell
environments, and allows a level of indirection for specifying
filtergraphs.
* commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25':
mpegaudiodec: Fix buffer handling on random access
mpegaudio: Refactor mp3on4 flush function
fate: Add dependencies for audio tests
fate: cosmetics: Group idct8x8 test together with all other libavcodec tests
fate: More fine-grained dependencies for libavcodec test programs
Conflicts:
tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '468ea9d5b14f92fe61f47f034e67066f65163f5f':
Revert "avutil: make some tables visible again"
Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility"
Conflicts:
libavcodec/sqrt_tab.c
libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'add3a6902ea4d459f36655656a1f8daa409118a7':
lavu: bump major to 52
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a':
lavu: postpone recent deprecations until the next major bump
APIchanges: update lavr bump date
avconv: only apply presets when we have an encoder.
atrac3: replace a calculation with FFALIGN()
atrac3: remove unused ATRAC3Context field, sample_rate
atrac3: use sizeof(variable) instead of sizeof(type)
atrac3: simplify MDCT window calculation
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This allows targets to include special objects when linking
executables without including them in (shared) libraries.
Signed-off-by: Mans Rullgard <mans@mansr.com>
The absence of this function will only give a less informative
string back from our fallback implementation of getnameinfo().
Signed-off-by: Mans Rullgard <mans@mansr.com>
Some systems require sys/time.h being explicitly included before
sys/resource.h. The configure check already does this.
Signed-off-by: Mans Rullgard <mans@mansr.com>
* commit '5d1007f74dd496d54b932242004382f44e3b22b4':
atrac3: initialize static tables in AVCodec.init_static_data()
atrac3: separate window initialization from IMDCT initialization
atrac3: move the 'frame_factor' field from ATRAC3Context to where it is used
atrac3: remove unused ATRAC3Context field, bit_rate
Conflicts:
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27':
atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used
atrac3: remove unused ATRAC3Context field, samples_per_channel
atrac3: use AVCodecContext.block_align instead of keeping a private copy
atrac3: move the 'delay' field from ATRAC3Context to where it is used
atrac3: move the 'version' field from ATRAC3Context to where it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45':
atrac3: use AVCodecContext.channels instead of keeping a private copy
atrac3: simplify some loop indexing
atrac3: cosmetics: pretty-printing and renaming
pcm: define AVCodec instances only for enabled codecs
libxvid: remove useless doxy comments.
lavc: remove stats_out from the options table.
Conflicts:
libavcodec/atrac3.c
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This causes make to exit with an error message if a nonexistent
dependency is specified rather than silently dropping the test.
Signed-off-by: Mans Rullgard <mans@mansr.com>
In addition to the recent tables mess, the AVOption defaults behavior
changed, so an old lavc used with a new lavu will get completely messed
up defaults.
Michael Niedermayer
Stefano Sabatini
Carl Eugen Hoyos
Isaac Dooley
Paul B Mahol
Peter Ross
Mans Rullgard
Diego Biurrun
Anton Khirnov