$(STRIP) always expands to something, because it is one of the commands
in the BRIEF list. This renders the condition pointless.
Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
avconv abuses the API by accessing AVStream.parser (which is private).
Removing AVStream.reference_dts in
2ba68dd044 breaks ABI compatibility for an
old avconv using a newer lavf. Fix this by adding a dummy field until
the next bump.
* commit 'feeafb4adabd5c17de1738ed9962e40892b20edb':
lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Note, the header was not installed so useage of this should be limited
but its not 0, there are some random pieces of code using it according
to google.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'c9a13a289d0e1607387854127476813a1ee3d34b':
lavc: remove old unused audio conversion functions.
Conflicts:
libavcodec/audioconvert.c
libavcodec/audioconvert.h
Merge only for metadata.
keeping the old API longer reduces the need for applications to be continuously
updated.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master:
ac3dec: fix outptr increment.
Conflicts:
libavcodec/ac3dec.c
No change as this has been fixed in ffmpeg head already
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'a1c5cc429d99216406170eac7e8352860076d3e8':
lavc: don't set AVFrame.pts to random numbers in decoders.
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '2ba68dd044ca8fc591139c05563840f546a9c0c0':
lavf: remove unreliable timestamp guessing heuristic
Conflicts:
libavformat/utils.c
Not merged, as the change breaks ABI by removing a field from the middle
of AVStream.
Also, if you have files that decode better or worse without this code please
open a ticket on trac. If the timestamp code turns out useless it of course
should be removed.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Fixes corrupt data errors when downmixing in the AC-3 decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org
* commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc':
g722dec: Change bits_per_codeword to the right option type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
avfilter: have avfilter_get_by_name return const for next bump
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '23a211cbba0b7c9ee694040031b2e5da1be54a00':
lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.
Conflicts:
libavcodec/avcodec.h
libavcodec/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer
Ingo Brückl
Derek Buitenhuis
Diego Biurrun
Anton Khirnov
Luca Barbato
Paul B Mahol
Stephen Hutchinson
Peter Ross