summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avformat/avienc: Fix wrongly placed commentMichael Niedermayer2015-03-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/avidec: also print frame_num in debug outputMichael Niedermayer2015-03-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/avienc: factor out update_odml_entry()Michael Niedermayer2015-03-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/avienc: factor write_odml_master() outMichael Niedermayer2015-03-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b'Michael Niedermayer2015-03-19
|\ | | | | | | | | | | | | * commit '30a041887f89cd97c372ad6a516da6e012f2c88b': ismindex: Calculate the pts duration of trun atoms, not the dts duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Calculate the pts duration of trun atoms, not the dts durationMartin Storsjö2015-03-19
| | | | | | | | | | | | | | Since the duration is compared to the tfra durations/intervals which are expressed in pts, calculate that here as well. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '67a2912307c3c08f2725ccae162cfe3426b80184'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit '67a2912307c3c08f2725ccae162cfe3426b80184': movenc: Don't assume that fragment durations in pts is equal to duration in dts Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Don't assume that fragment durations in pts is equal to duration in dtsMartin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | For strict CFR, they should be pretty much equal, but if the stream is VFR, there can be a sometimes significant difference. Calculate the pts duration separately, used in sidx atoms and for tfrf/tfxd boxes in smooth streaming ismv files. Also make sure to reduce the duration of sidx entries according to edit lists. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5c337353a2546416631a87de4881850d99141c39'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit '5c337353a2546416631a87de4881850d99141c39': movenc: Move sidx edit list timestamp adjustment into a block Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Move sidx edit list timestamp adjustment into a blockMartin Storsjö2015-03-19
| | | | | | | | | | | | | | When reading these values from track->frag_info, the same adjustment has already been done. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'eee13d653953083553cceadbbedf6222ef78a006'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit 'eee13d653953083553cceadbbedf6222ef78a006': movenc: Only adjust the cts offset at the start of fragments if necessary Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Only adjust the cts offset at the start of fragments if necessaryMartin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | Adjusting it is only necessary when a sidx/tfrf/tfxd atom already has been written for the previous fragment (since the sidx/tfrf/tfxd atoms include the duration between the first pts of the previous fragment, to the first pts of the new fragment). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb': movenc: Write pts timestamps in tfxd, instead of dts timestamps Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Write pts timestamps in tfxd, instead of dts timestampsMartin Storsjö2015-03-19
| | | | | | | | | | | | This matches what we write in tfra and tfrf since 9cbf70fa0e. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b81b0cc22b22413760423e239ea644c9afdbfa2d'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit 'b81b0cc22b22413760423e239ea644c9afdbfa2d': movenc: Set the last packet duration based on the next packet when autoflushing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Set the last packet duration based on the next packet when autoflushingMartin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When automatically flushing fragments based on set conditions (fragmentation on keyframes, after some interval or byte size), we already have the next packet for one stream - use this for setting the duration of the last packet in the flushed fragment correctly. This avoids having to adjust the timestamp of the first packet in the new fragment since the last duration was unknown. Unfortunately, this only works for automatic flushing (not for caller-triggered flushing, like in the dash muxer), and only for the one single track that triggered the flushing. The duration of the last sample in all other tracks still is dependent on AVPacket duration (or heuristics). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3041183677bda0a431b36e96a2c76617abaa8183'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit '3041183677bda0a431b36e96a2c76617abaa8183': dashenc: Heuristically fill in the duration of packets that need it Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Heuristically fill in the duration of packets that need itMartin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | | | | | This avoids that the mp4 muxer does a similar heuristic, adjusting the timestamps in a way that the dash muxer doesn't know the actual timestamps written to the file in the end. By making sure that the mp4 muxer internal heuristic isn't applied, we know the exact timestamps written to file, so that the timestamps in manifest match the files. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2889c5e16711770437f380f1bead5f72c6a0b17a'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit '2889c5e16711770437f380f1bead5f72c6a0b17a': movenc: Heuristically set the duration of the last sample in a fragment if not set Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Heuristically set the duration of the last sample in a fragment if ↵Martin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not set Even if this is a guess, it is way better than writing a zero duration of the last sample in a fragment (because if the duration is zero, the first sample of the next fragment will have the same timestamp as the last sample in the previous one). Since we normally don't require libavformat muxer users to set the duration field in AVPacket, we probably can't strictly require it here either, so don't log this as a strict warning, only as info. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8dc72eeaf647736c287b59a3856a11904bedd58b'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | | | * commit '8dc72eeaf647736c287b59a3856a11904bedd58b': udp: Fix crashes after adding AVOptions See: aefed6ca87971a9d277157c92fef4cdd42c5c1e2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * udp: Fix crashes after adding AVOptionsMartin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | | | | | Add a missing AVClass member, check whether localaddr is null. (Previously, localaddr was always a local stack buffer, while it now also can be an avoption string which can be null.) This fixes crashes when not passing any localaddr parameter, since 66028b7ba. Signed-off-by: Martin Storsjö <martin@martin.st>
* | mxfenc: don't try to write footer without headerAndreas Cadhalpun2015-03-19
| | | | | | | | | | | | | | | | This fixes a crash, when trying to mux h264 into mxf_opatom. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Previous version reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aiffdec: do not fail if header parser hits EOFMichael Niedermayer2015-03-19
| | | | | | | | | | Based on patch by Martin Vignali <martin.vignali@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aiffdec: Stop header parsing once a non header packet is reachedMichael Niedermayer2015-03-19
| | | | | | | | | | | | | | Fix Ticket3530 Based-on debuging work by Martin Vignali <martin.vignali@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_colormatrix: fix yuv420p threading, second tryClément Bœsch2015-03-19
| | | | | | | | | | Now seems to work fine with different combinations of odd/even heights and odd/even number of threads.
* | avcodec/mjpegdec: Support 31111100 samplingMichael Niedermayer2015-03-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Change upscale_* to an array instead of a bitmaskMichael Niedermayer2015-03-18
| | | | | | | | | | | | This allows storing integer factors instead of just 0 and 1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-03-18
|\ \ | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does. lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.Carl Eugen Hoyos2015-03-18
| | | | | | | | | | | | This change allows remuxing hevc from mpeg-ts to Matroska.
| * | lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.Carl Eugen Hoyos2015-03-18
| | | | | | | | | | | | | | | | | | Fixes ticket #4375. Reviewed-by: Hendrik Leppkes
* | | Merge commit '8692d74b7364b405d7939c0ed347e8a2815193a7'Michael Niedermayer2015-03-18
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | * commit '8692d74b7364b405d7939c0ed347e8a2815193a7': mov: Add option to keep exact packet sequence after seeking Conflicts: libavformat/isom.h libavformat/mov.c libavformat/version.h See: 414d6547f33175b3f53eb3320aa13161a584a151 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Add option to keep exact packet sequence after seekingDerek Buitenhuis2015-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current behavior may produce a different sequence of packets after seeking, compared to demuxing linearly from the beginning. This is because the MOV demuxer seeks in each stream individually, based on timestamp, which may set each stream at a slightly different position than if the file would have been read sequentially. This makes implementing certain operations, such as segmenting, quite hard, and slower than need be. Therefore, add an option which retains the same packet sequence after seeking, as when a file is demuxed linearly.
* | avformat/http: replace cookies with updated values instead of appending foreverMicah Galizia2015-03-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips/float_dsp: fix vector_fmul_window_mips on mips64James Cowgill2015-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit dfa920807494 ("mips/float_dsp: fix a bug in vector_fmul_window_mips") fixed vector_fmul_window_mips by unrolling the loop only 4 times, but also removed the outer C loop and replaced it with assembly branches and pointer arithmetic. When submitting my 64-bit porting patch I missed this new assembly which also needed porting. This patch fixes a bus error in the fate-float-dsp test when run on 64-bit mips. Signed-off-by: James Cowgill <james410@cowgill.org.uk> Reviewed-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: Add option to keep exact packet sequence after seekingDerek Buitenhuis2015-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current behavior may produce a different sequence of packets after seeking, compared to demuxing linearly from the beginning. This is because the MOV demuxer seeks in each stream individually, based on timestamp, which may set each stream at a slightly different position than if the file would have been read sequentially. This makes implementing certain operations, such as segmenting, quite hard, and slower than need be. Therefore, add an option which retains the same packet sequence after seeking, as when a file is demuxed linearly.
* | avfilter/vf_lut3d: Change enum to int, which is accessed via AVOption as intMichael Niedermayer2015-03-18
| | | | | | | | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_il: Change enums to int, which are accessed via AVOption as intMichael Niedermayer2015-03-18
| | | | | | | | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_histogram: Change enum to int, which is accessed via AVOption as intMichael Niedermayer2015-03-18
| | | | | | | | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: add showwavespic filterClément Bœsch2015-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a variant of showwaves. It is implemented as a different filter so that the user is not allowed to use meaningless options which belong to showwaves (such as rate). Major edits done by Stefano Sabatini, from a patch by ubitux. See thread: From: Clément Bœsch <u@pkh.me> To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Dec 2014 15:03:26 +0100 Subject: [FFmpeg-devel] [PATCH] avfilter/showwaves: add single_pic option
* | Replace PixelFormats which sneaked in over time or where forgotten by ↵Michael Niedermayer2015-03-18
| | | | | | | | | | | | AVPixelFormats Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '58a840e21577a2168843487a98cb2cea44b5a94a'Michael Niedermayer2015-03-18
|\| | | | | | | | | | | | | | | * commit '58a840e21577a2168843487a98cb2cea44b5a94a': Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat See: ac627b3d38d370027406c93c2dcaac0b1712a7d4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace a few leftover instances of enum PixelFormat with enum AVPixelFormatMartin Storsjö2015-03-17
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/ac3dec_fixed: fix compilation when ac3dec is disabledJames Almer2015-03-17
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/aacsbr: Replace impossible condition by assertMichael Niedermayer2015-03-17
| | | | | | | | | | | | bits can have a value of 0 or 1 they are never -1 or otherwise negative Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b'Michael Niedermayer2015-03-17
|\| | | | | | | | | | | | | | | | | | | * commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b': fate: Move tdsc to the appropriate screen capture file Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Move tdsc to the appropriate screen capture fileVittorio Giovara2015-03-17
| |
* | Merge commit '423f5d50e499ab972f507115700c8f31ed8993e4'Michael Niedermayer2015-03-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '423f5d50e499ab972f507115700c8f31ed8993e4': mov: Fix little endian audio detection Conflicts: libavformat/mov.c See: d2549ba9df1a1aac8c0ae19bfca2c81e508ba02e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Fix little endian audio detectionVittorio Giovara2015-03-17
| | | | | | | | | | | | | | | | | | | | Set this field to TRUE if the audio component is to operate on little-endian data, and FALSE otherwise. However TRUE and FALSE are not defined. Since this flag is just a boolean, interpret all values except for 0 as little endian. Sample-Id: 64bit_FLOAT_Little_Endian.mov
* | Merge commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0'Michael Niedermayer2015-03-17
|\| | | | | | | | | | | | | | | * commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0': aacsbr: Fix type for index variable See: a15adabdd32c8736c143fcbef36a0f4a75f772f0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 09:12:00 +0000