summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3'James Almer2017-09-26
|\ | | | | | | | | | | | | * commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3': Mark some arrays that never change as const. Merged-by: James Almer <jamrial@gmail.com>
| * Mark some arrays that never change as const.Anton Khirnov2017-02-01
| |
* | Merge commit 'b420a27e74750b60d2e064236afb10be06a38ace'James Almer2017-09-26
|\| | | | | | | | | | | | | | | | | * commit 'b420a27e74750b60d2e064236afb10be06a38ace': avconv: allow -b to be used with streamcopy This commit is a noop. We already have this functionality. Merged-by: James Almer <jamrial@gmail.com>
| * avconv: allow -b to be used with streamcopyAnton Khirnov2017-02-01
| | | | | | | | In this mode it tells the muxer about the bitrate of the input stream.
* | Merge commit 'ab2539bd374fe7ddbc6e2f058b62645cd5076192'James Almer2017-09-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab2539bd374fe7ddbc6e2f058b62645cd5076192': ffv1: Convert to the new bitstream reader h261dec: Convert to the new bitstream reader shorten: Convert to the new bitstream reader ralf: Convert to the new bitstream reader loco: Convert to the new bitstream reader fic: Convert to the new bitstream reader dirac: Convert to the new bitstream reader cavs: Convert to the new bitstream reader aic: Convert to the new bitstream reader golomb: Convert to the new bitstream reader This commit is a noop, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html Merged-by: James Almer <jamrial@gmail.com>
| * ffv1: Convert to the new bitstream readerAlexandra Hájková2017-01-31
| |
| * h261dec: Convert to the new bitstream readerAlexandra Hájková2017-01-31
| |
| * shorten: Convert to the new bitstream readerAlexandra Hájková2017-01-31
| |
| * ralf: Convert to the new bitstream readerAlexandra Hájková2017-01-31
| |
| * loco: Convert to the new bitstream readerAlexandra Hájková2017-01-31
| |
| * fic: Convert to the new bitstream readerAlexandra Hájková2017-01-31
| |
| * dirac: Convert to the new bitstream readerAlexandra Hájková2017-01-31
| |
| * cavs: Convert to the new bitstream readerAlexandra Hájková2017-01-31
| |
| * aic: Convert to the new bitstream readerAlexandra Hájková2017-01-31
| |
| * golomb: Convert to the new bitstream readerDiego Biurrun2017-01-31
| |
* | Merge commit 'ab87af41636b081dd3562423999351b5444fa09e'James Almer2017-09-26
|\| | | | | | | | | | | | | * commit 'ab87af41636b081dd3562423999351b5444fa09e': configure: Add proper weak dependency of avformat on network Merged-by: James Almer <jamrial@gmail.com>
| * configure: Add proper weak dependency of avformat on networkDiego Biurrun2017-01-31
| |
* | Merge commit '612cc0712836af2f025b0c68b11da29b9f259d5a'James Almer2017-09-26
|\| | | | | | | | | | | | | | | | | * commit '612cc0712836af2f025b0c68b11da29b9f259d5a': pgssubdec: reset rle_data_len/rle_remaining_len on allocation error This commit is a noop, see 842e98b4d83d8cf297e2bc2761f1f47eb89e49e4 Merged-by: James Almer <jamrial@gmail.com>
| * pgssubdec: reset rle_data_len/rle_remaining_len on allocation errorAndreas Cadhalpun2017-01-31
| | | | | | | | | | | | | | | | The code relies on their validity and otherwise can try to access a NULL object->rle pointer, causing segmentation faults. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '708e84cda1bdbffb92847f3d6ccf6fbeb26d9948'James Almer2017-09-26
|\| | | | | | | | | | | | | * commit '708e84cda1bdbffb92847f3d6ccf6fbeb26d9948': mov: Avoid memcmp of uninitialised data Merged-by: James Almer <jamrial@gmail.com>
| * mov: Avoid memcmp of uninitialised dataMark Thompson2017-01-30
| | | | | | | | | | | | | | | | | | The string codec name need not be as long as the value we are comparing it to, so memcmp may make decisions derived from uninitialised data that valgrind then complains about (though the overall result of the function will always be the same). Use strncmp instead, which will stop at the first zero byte and therefore not encounter this issue.
* | Merge commit 'ca62236a89f47bd871eaf69d8d9e837c93c55a6c'James Almer2017-09-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca62236a89f47bd871eaf69d8d9e837c93c55a6c': vaapi_encode: Add VP8 support vaapi_encode: Pass framerate parameters to driver vaapi_h264: Enable VBR mode vaapi_encode: Support VBR mode This commit is a noop, see ceb28c3cc4c7921935b48904db3c559eed1597fe 2201c02e6dc9f9652a8e27dec194915f05954ad0 be6546a4ff592785d039df6cbdd7659781d30b2c d1acab8293054151157910eb081d5edcc7496e13 Merged-by: James Almer <jamrial@gmail.com>
| * vaapi_encode: Add VP8 supportMark Thompson2017-01-30
| |
| * vaapi_encode: Pass framerate parameters to driverMark Thompson2017-01-30
| | | | | | | | | | | | | | Only do this when building for a recent VAAPI version - initial driver implementations were confused about the interpretation of the framerate field, but hopefully this will be consistent everywhere once 0.40.0 is released.
| * vaapi_h264: Enable VBR modeMark Thompson2017-01-30
| | | | | | | | | | | | | | | | Default to using VBR when a target bitrate is set, unless the max rate is also set and matches the target. Changes to the Intel driver mean that min_qp is also respected in this case, so set a codec default to unset the value rather than using the current default inherited from the MPEG-4 part 2 encoder.
| * vaapi_encode: Support VBR modeMark Thompson2017-01-30
| | | | | | | | | | | | This includes a backward-compatibility hack to choose CBR anyway on old drivers which have no CBR support, so that existing programs will continue to work their options now map to VBR.
* | Merge commit 'c5c663541739cb813a2a5668ee8339b535b35d7d'Rodger Combs2017-09-26
|\| | | | | | | | | | | | | * commit 'c5c663541739cb813a2a5668ee8339b535b35d7d': doc: add dash muxer Merged-by: Rodger Combs <rodger.combs@gmail.com>
| * doc: add dash muxerPeter Große2017-01-31
| | | | | | | | | | Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7295b7373862ee54903b33d6ef3335531dfa93ad'Rodger Combs2017-09-26
|\| | | | | | | | | | | | | * commit '7295b7373862ee54903b33d6ef3335531dfa93ad': dashenc: add webm support Merged-by: Rodger Combs <rodger.combs@gmail.com>
| * dashenc: add webm supportPeter Große2017-01-31
| | | | | | | | | | | | | | Use webm muxer for VP8, VP9 and Opus codec, mp4 muxer otherwise. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '01f1f017d831cf14617aaaeafcec3ae3a81efce7'Rodger Combs2017-09-26
|\| | | | | | | | | | | | | * commit '01f1f017d831cf14617aaaeafcec3ae3a81efce7': dashenc: use avio_dynbuf instead of packet_write callback Merged-by: Rodger Combs <rodger.combs@gmail.com>
| * dashenc: use avio_dynbuf instead of packet_write callbackPeter Große2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dash_write function drops data, if no IOContext is initialized. Since the mp4 muxer is used in "frag_custom" mode, data is only written when calling av_write_frame(NULL) explicitly and thus there will be no data loss. To add support for webm as subordinate muxer, which doesn't have such a mode, a dynamic buffer is required to provide an always initialized IOContext. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'dce2929efa8e82b0832a828f7e8cb81ff8c20a4e'Rodger Combs2017-09-26
|\| | | | | | | | | | | | | * commit 'dce2929efa8e82b0832a828f7e8cb81ff8c20a4e': dashenc: copy language and role metadata from streams assigned to sets Merged-by: Rodger Combs <rodger.combs@gmail.com>
| * dashenc: copy language and role metadata from streams assigned to setsPeter Große2017-01-31
| | | | | | | | | | Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ca9bc9de690258d4761a19b0df6e9c9113b80115'Rodger Combs2017-09-26
|\| | | | | | | | | | | | | * commit 'ca9bc9de690258d4761a19b0df6e9c9113b80115': dashenc: default to one AdaptationSet per stream Merged-by: Rodger Combs <rodger.combs@gmail.com>
| * dashenc: default to one AdaptationSet per streamPeter Große2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously all mapped streams of a media type (video, audio) where assigned to a single AdaptationSet. Using the DASH live profile it is mandatory, that the segments of all representations are aligned, which is currently not enforced. This leads to problems when using video streams with different key frame intervals. So to play safe, default to one AdaptationSet per stream, unless overwritten by explicit assignment. To get the old assignment scheme, use -adaptation_sets "id=0,streams=v id=1,streams=a" Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'efd2fc41b3f0749f9715d50b581f22bbaa8c5b99'Rodger Combs2017-09-26
|\| | | | | | | | | | | | | * commit 'efd2fc41b3f0749f9715d50b581f22bbaa8c5b99': dashenc: allow assigning all streams of a media type to an AdaptationSet Merged-by: Rodger Combs <rodger.combs@gmail.com>
| * dashenc: allow assigning all streams of a media type to an AdaptationSetPeter Große2017-01-31
| | | | | | | | | | | | | | | | | | Using the characters "v" or "a" instead of stream index numbers for assigning streams in the adaption_set option, all streams matching that given type will be added to the AdaptationSet. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3d23a5f96ad72961c14ba3a0c2add8f2ab374b61'Rodger Combs2017-09-26
|\| | | | | | | | | | | | | * commit '3d23a5f96ad72961c14ba3a0c2add8f2ab374b61': dashenc: add support for assigning streams to AdaptationSets Merged-by: Rodger Combs <rodger.combs@gmail.com>
| * dashenc: add support for assigning streams to AdaptationSetsPeter Große2017-01-31
| | | | | | | | | | | | | | | | | | Also makes sure all streams are assigned to exactly one AdaptationSet. This patch is originally based partially on code by Vignesh Venkatasubramanian. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9df9309d233f59d9706444a1e24ac24139f2640d'Rodger Combs2017-09-26
|\| | | | | | | | | | | | | * commit '9df9309d233f59d9706444a1e24ac24139f2640d': dashenc: calculate stream bitrate from first segment if not available Merged-by: Rodger Combs <rodger.combs@gmail.com>
| * dashenc: calculate stream bitrate from first segment if not availablePeter Große2017-01-31
| | | | | | | | | | | | | | | | | | Bandwidth information is required in the manifest, but not always provided by the demuxer. In that case calculate the bandwith based on the size and duration of the first segment. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Revert "lavf/dashenc: update bitrates on dash_write_trailer"James Almer2017-09-26
| | | | | | | | | | | | | | | | This reverts commit 89c0fda5f43d8a3d3a1c538ff8d72e6737bc7d8e. A different solution will be committed instead. Signed-off-by: James Almer <jamrial@gmail.com>
* | lavf/tls_gnutls: fix warnings from version checkMoritz Barsnick2017-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The GnuTLS version is checked through the macro GNUTLS_VERSION_NUMBER, but this wasn't introduced before 2.7.2. Building with older versions of GnuTLS (using icc) warns: src/libavformat/tls_gnutls.c(38): warning #193: zero used for undefined preprocessing identifier "GNUTLS_VERSION_NUMBER" #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00 This adds a fallback to the older, deprecated LIBGNUTLS_VERSION_NUMBER macro. Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
* | lavf/tls_gnutls: fix compilation with GnuTLS 2.xMoritz Barsnick2017-09-26
| | | | | | | | | | | | | | | | Commit 598e41684066feba701d19ca7443d24b9e5efa77 added use of GNUTLS_E_PREMATURE_TERMINATION, which wasn't introduced to GnuTLS before 2.99.x / 3.x. This fixes compilation with older versions. Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
* | avcodec/dnxhdenc: fix DNxHR 444 encoding crashesFrédéric Devernay2017-09-26
| | | | | | | | Fixes #6649.
* | avformat/img2enc: remove av_dup_packet() callJames Almer2017-09-25
| | | | | | | | | | | | It's unnecessary after a call to av_packet_ref(). Signed-off-by: James Almer <jamrial@gmail.com>
* | ffplay: replace use of av_copy_packet()James Almer2017-09-25
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: replace all uses of av_copy_packet()James Almer2017-09-25
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/avpacket: deprecate av_copy_packet()James Almer2017-09-25
| | | | | | | | | | | | It does the same thing as av_packet_ref(). Signed-off-by: James Almer <jamrial@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 09:43:57 +0000