summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | avcodec/dds: fix paletted filesMichael Niedermayer2015-07-19
| | | | | | | | | | | | | | | | | | Fixes Ticket4664 The changed fate tests lack red/blue shades and thus look correct either way Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | RELEASE: update to 2.7.gitJames Almer2015-07-19
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/mp3dec: remove unused variableJames Almer2015-07-19
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avfilter: add random video filterPaul B Mahol2015-07-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avdevice/decklink: Add missing libraries when building with DeckLink support ↵Chris Spencer2015-07-19
| | | | | | | | | | | | | | on Windows. Signed-off-by: Chris Spencer <spencercw@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Add support for Audible AAX (and AAX+) filesVesselin Bontchev2015-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mp3dec: split position sync code outMichael Niedermayer2015-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/utils: Check that channel count is valid in avcodec_open2();Michael Niedermayer2015-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | * commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031': qsvenc: properly handle asynchronous encoding Conflicts: libavcodec/qsvenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * qsvenc: properly handle asynchronous encodingAnton Khirnov2015-07-19
| | | | | | | | Wait for async_depth frames before syncing.
* | Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | * commit 'f5c4d38c78347b09478e21a661befff4b2d44643': qsvdec: properly handle asynchronous decoding Conflicts: libavcodec/qsvdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * qsvdec: properly handle asynchronous decodingAnton Khirnov2015-07-19
| | | | | | | | Wait for async_depth frames before syncing.
* | Merge commit '6b15874fc2c3f565732201f7907ae1112727d6ae'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | * commit '6b15874fc2c3f565732201f7907ae1112727d6ae': af_resample: do not touch the timestamps if we are not resampling Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * af_resample: do not touch the timestamps if we are not resamplingAnton Khirnov2015-07-19
| | | | | | | | | | | | | | | | | | This filter currently assumes that the input audio is continuous and does some timestamps manipulation based on this assumption. This is unnecessary if we are only converting the channel layout or the sample format, without resampling. In such a case, just leave the timestamps as they are.
* | ffmpeg_filter: Check that filters have connected outputs before accessing ↵Michael Niedermayer2015-07-19
| | | | | | | | | | | | the output stream Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | | | * commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c': avconv: split creating and (re-)configuring complex filtergraphs Conflicts: ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * avconv: split creating and (re-)configuring complex filtergraphsAnton Khirnov2015-07-19
| | | | | | | | | | | | | | The current code is less than straightforward due to the fact that output streams can be created based on filtergraph definitions. This change should make the code simpler and more readable. It will also be useful in the future commits.
* | avfilter: Add reverse filterDerek Buitenhuis2015-07-19
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | * commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727': avconv: create the complex filtergraphs earlier Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * avconv: create the complex filtergraphs earlierAnton Khirnov2015-07-19
| | | | | | | | | | | | Since global options are processed before all the other options now, we do not have to try creating the complex filtergraphs several times anymore, it is enough to do it once after the input files are opened.
* | Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | * commit '1959351aecf09fc3e90208ff775f4849801dc13f': avconv: move the no streams failure to open_output_file() Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * avconv: move the no streams failure to open_output_file()Anton Khirnov2015-07-19
| | | | | | | | | | It is a better place for it, there is no reason to wait until transcode_init().
* | Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | * commit 'ab7b038906f3e40ed474676d8e3029902a2078f5': avconv: factor out the output stream initialization Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * avconv: factor out the output stream initializationAnton Khirnov2015-07-19
| |
* | Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e': avconv: use read_file() for reading the 2pass stats Conflicts: cmdutils.c cmdutils.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * avconv: use read_file() for reading the 2pass statsAnton Khirnov2015-07-19
| | | | | | | | | | Also, drop the now unused cmdutils_read_file(). There is no reason to have two functions doing essentially the same thing.
* | Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | * commit '6d5d9246042acb804a652e6fedfb7afe0ca85614': avconv: move handling the 2pass logfile into avconv_opt Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * avconv: move handling the 2pass logfile into avconv_optAnton Khirnov2015-07-19
| | | | | | | | It more logically belongs there.
* | Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | * commit '59245e0c5e10a849e67c632cccf4f677b2442e82': avconv: set the encoding/decoding_needed flags earlier Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * avconv: set the encoding/decoding_needed flags earlierAnton Khirnov2015-07-19
| | | | | | | | This will be useful in the following commits.
* | ffmpeg_opt: Fix stream copy flag for attachmentsMichael Niedermayer2015-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '56c2f37727015212a404cae0f444d8bc8704d691': avconv: drop update_sample_fmt() Conflicts: ffmpeg.c No change as the removed code is not in FFmpeg Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * avconv: drop update_sample_fmt()Anton Khirnov2015-07-19
| | | | | | | | | | | | | | There is only one decoder left that supports this (libopus, which is not used by default since we have a native one) and this code goes against the avconv design, since it propagates information back from the encoder to decoder.
* | Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | * commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57': asfdec: make nb_sub to be unsigned int Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: make nb_sub to be unsigned intAlexandra Hájková2015-07-19
| | | | | | | | | | | | number of subpayloads should be always positive Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '2883ef34b59c9b427c4cfad4620c3235e5778406'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | * commit '2883ef34b59c9b427c4cfad4620c3235e5778406': asfdec: read the replicated data in a separate function Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: read the replicated data in a separate functionAlexandra Hájková2015-07-19
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '0989d3ad1fbd7509815208b0a5792918492d2a68'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | * commit '0989d3ad1fbd7509815208b0a5792918492d2a68': asfdec: convert condition for the replicated data reading to be safer Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: convert condition for the replicated data reading to be saferAlexandra Hájková2015-07-19
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '406627287e015ce381795e85e2557b12bf60ca35'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | * commit '406627287e015ce381795e85e2557b12bf60ca35': asfdec: do not read replicated data when their length is 0 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: do not read replicated data when their length is 0Alexandra Hájková2015-07-19
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/hevc_parser: Treat extradata parsing differently, as it should not ↵Michael Niedermayer2015-07-19
| | | | | | | | | | | | | | | | contain an AU Fixes ticket4718 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avutil/x86/bswap: force inline asm versions with ICCJames Almer2015-07-18
| | | | | | | | | | | | | | | | Recent ICC versions that define GCC as >= 4.5 (like ICC 13) apparently can't optimize the generic C versions of av_bswap*() on their own. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avutil/intmath: check for ICC before GCCJames Almer2015-07-18
| | | | | | | | | | | | | | | | Intel compiler also defines __GNUC__, so the Intel specific intrinsics were not really being used. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avfilter/vf_blend: unbreak tblendPaul B Mahol2015-07-18
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | fate: add tblend filter testPaul B Mahol2015-07-18
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/mpegtsenc: Add sdt_period, similar to pat_periodMichael Niedermayer2015-07-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mpegtsenc: Support a user specified PAT/PMT periodMichael Niedermayer2015-07-18
| | | | | | | | | | | | Can be used to fix Ticket3714 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mpegtsenc: support storing PAT/PMT per frameMichael Niedermayer2015-07-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/developer: add url for sample filesGanesh Ajjanagadde2015-07-18
| | | | | | | | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>