summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit 'db9b7321d5dfcbaf521d46beec44cf724776c70d'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit 'db9b7321d5dfcbaf521d46beec44cf724776c70d': vsrc_color: implement frame rate Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vsrc_color: implement frame rateJohn Stebbins2015-11-09
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1339009c4924a20e872aa62897097bf5d071157c'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '1339009c4924a20e872aa62897097bf5d071157c': vf_showinfo: show timebase & framerate too Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vf_showinfo: show timebase & framerate tooMichael Niedermayer2015-11-09
| | | | | | | | | | (cherry picked from ffmpeg commit fdb93996811bacfa7b82995cdc0f93c46f3dc6cc) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '11f87ca71e9c7b917f594194f827fd040d1df5ca'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '11f87ca71e9c7b917f594194f827fd040d1df5ca': vf_frei0r: also set AVFilterLink.frame_rate Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vf_frei0r: also set AVFilterLink.frame_rateMichael Niedermayer2015-11-09
| | | | | | | | | | (cherry picked from ffmpeg commit 353cf95f948ef7c6139c8ead79e9eeb9eb8d2e6e) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '7d12cba95ca15198a930c05458dc414ac00c578b'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '7d12cba95ca15198a930c05458dc414ac00c578b': vf_framepack: Check and update frame_rate Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vf_framepack: Check and update frame_rateMichael Niedermayer2015-11-09
| | | | | | | | | | (cherry picked from ffmpeg commit a46a23d30fea9c8a5570e07ec4d9c9b4eaa6eb4f) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '65e73bc60f98dc7b26c687e145dfb755d3f2ccfa'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '65e73bc60f98dc7b26c687e145dfb755d3f2ccfa': vf_interlace: implement frame rate Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vf_interlace: implement frame rateMichael Niedermayer2015-11-09
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from ffmpeg commit 227b4458fb434875b127a0c2306fa3b899a770bf) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '018bdaed37d2f1735dbecfc58309a1a164abadd5'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '018bdaed37d2f1735dbecfc58309a1a164abadd5': setpts: add FRAME_RATE constant Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * setpts: add FRAME_RATE constantStefano Sabatini2015-11-09
| | | | | | | | | | | | | | | | Useful for dealing with constant frame-rate video. (cherry picked from ffmpeg commit 722762f7e1212b4d02142778fabfdd73375722e0) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f': testsrc: set output framerate Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * testsrc: set output framerateStefano Sabatini2015-11-09
| | | | | | | | | | | | (cherry picked from ffmpeg commit 7cd5fa35fecc2717223459d04822faed6bbd40fa) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '9df477e03ef74068f3de130adc4dd34349a16ef2'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '9df477e03ef74068f3de130adc4dd34349a16ef2': yadif: update frame rate Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * yadif: update frame rateMichael Niedermayer2015-11-09
| | | | | | | | | | (cherry picked from ffmpeg commit 31619584556466e4beab98e9b04ed4c5ba0db178) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41': vf_fps: set frame_rate. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vf_fps: set frame_rate.Nicolas George2015-11-09
| | | | | | | | | | | | (cherry picked from ffmpeg commit 0d249316043fb69a3972029bff3a2969689ba8b6) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '61fb67dcb2e71a268c422fc19d366040e59fb337'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '61fb67dcb2e71a268c422fc19d366040e59fb337': buffersrc: accept the frame rate as argument. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * buffersrc: accept the frame rate as argument.Nicolas George2015-11-09
| | | | | | | | | | | | (cherry picked from ffmpeg commit 9ca440679dc535b31edd569393d8d3dda59db90e) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '48ff6683ba5d40b629428673b1028e8ec542a9fa'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '48ff6683ba5d40b629428673b1028e8ec542a9fa': lavfi: add a frame_rate field to AVFilterLink. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavfi: add a frame_rate field to AVFilterLink.Nicolas George2015-11-09
| | | | | | | | | | | | (cherry picked from ffmpeg commit 7b42036b3b23c85f473bf9369e37fa8da22eaf93) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '79f5347a983342e2711ca8ba19ec3d8d151183f0'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '79f5347a983342e2711ca8ba19ec3d8d151183f0': avcodec: fix doxy placement Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avcodec: fix doxy placementAnton Khirnov2015-11-09
| |
* | Merge commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8'Hendrik Leppkes2015-11-11
|\| | | | | | | | | | | | | * commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8': lavf: deprecate compute_pkt_fields2 Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavf: deprecate compute_pkt_fields2Anton Khirnov2015-11-09
| | | | | | | | | | | | | | | | | | All encoders set pts and dts properly now (and have been doing that for a while), so there is no good reason to do any timestamp guessing in the muxer. The newly added AVStreamInternal will be later used for storing all the private fields currently living in AVStream.
* | avformat/utils: re-factor freeing AVStreamsHendrik Leppkes2015-11-11
| | | | | | | | This matches the Libav signature and simplifies merging future changes.
* | avformat/rsd: XMA2 is actually stored, not XMA1Paul B Mahol2015-11-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffmpeg_filter: remove redundant null ptr checkMichael Niedermayer2015-11-11
| | | | | | | | | | | | Fixes: CID1338331 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/avf_showcqt: Fix uninitialized return codeMichael Niedermayer2015-11-11
| | | | | | | | | | | | Fixes CID1322329 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/webvttdec: Fix uninitialized use of variable "again"Michael Niedermayer2015-11-11
| | | | | | | | | | Fixes CID1338336 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dvdsubdec: validate offset2 similar to offset1Andreas Cadhalpun2015-11-11
| | | | | | | | | | | | | | If it is negative, it causes segmentation faults in decode_rle. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avutil/x86/intmath: Disable use of tzcnt on older intel compilers.Matt Oliver2015-11-11
| | | | | | | | | | | | | | ICC versions older than atleast 12.1.6 dont have the tzcnt intrinsics. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Matt Oliver <protogonoi@gmail.com>
* | avformat/mov: Add option to ignore chapters during parsingBryan Huh2015-11-10
| | | | | | | | | | | | | | | | | | | | Chapter-indexing can be expensive since chapters may be interspersed throughout the entire file and may require many seeks - especially costly when consuming a video over a remote protocol like http. Furthermore it is often unnecessary, especially when only trying to get video info (e.g. via ffprobe). Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mxfenc: Only store user comment related tags when neededMichael Niedermayer2015-11-10
| | | | | | | | | | | | | | | | | | | | Also support disabling them as they seem to cause problems to some Users. They are also not allowed in IRT D-10 thus the default for mxf_d10 is not to write them This also decreases the filesize when no user comment are stored Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/gifdec: skip the data lzw consumedNi Hui2015-11-10
| | | | | | | | | | | | | | | | this fixes the return code of avcodec_decode_video2 for gif decoding and the gif frame data buffer is skipped properly Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/lzw: ff_lzw_decode_tail() now returns the consumed bytes in lzw ↵Ni Hui2015-11-10
| | | | | | | | | | | | | | decompress Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | brstm: reject negative sample rateAndreas Cadhalpun2015-11-10
| | | | | | | | | | | | | | A negative sample rate causes assertion failures in av_rescale_rnd. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avcodec/wmaprodec: XMA1 actually have packet sequence numbersPaul B Mahol2015-11-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | aviflter/vf_waveform: speed up non-color filtersPaul B Mahol2015-11-10
| | | | | | | | | | | | Remove loops, output is also more interesting. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/wavdec: allow data chunk to be before fmt/xma2 chunkPaul B Mahol2015-11-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/wavdec: parse XMA2 tagPaul B Mahol2015-11-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'aeda1121c91395d1f0d434bc7f227423aa2ff97d'Hendrik Leppkes2015-11-10
|\| | | | | | | | | | | | | * commit 'aeda1121c91395d1f0d434bc7f227423aa2ff97d': lavf: factor out freeing an AVStream Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavf: factor out freeing an AVStreamAnton Khirnov2015-11-08
| | | | | | | | It will be needed in other functions.
* | Merge commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4'Hendrik Leppkes2015-11-10
|\| | | | | | | | | | | | | * commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4': avconv: set packet duration for CFR video streams Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: set packet duration for CFR video streamsAnton Khirnov2015-11-08
| |
* | Merge commit 'a0c71a575109f123978e345fa7eb4ac03cd4d3c3'Hendrik Leppkes2015-11-10
|\| | | | | | | | | | | | | * commit 'a0c71a575109f123978e345fa7eb4ac03cd4d3c3': lavf: initialize cur_dts to AV_NOPTS_VALUE for muxing Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavf: initialize cur_dts to AV_NOPTS_VALUE for muxingAnton Khirnov2015-11-08
| | | | | | | | The reasoning for setting it to zero only applies to demuxing.
* | Merge commit 'cc96018c79cd4dc823e0cef938da2131e4660fe5'Hendrik Leppkes2015-11-10
|\| | | | | | | | | | | | | * commit 'cc96018c79cd4dc823e0cef938da2131e4660fe5': libopenh264enc: Set AVOption data type Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libopenh264enc: Set AVOption data typeMichael Niedermayer2015-11-06
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 05:58:04 +0000