Michael Niedermayer
46070cc20a
ffmpeg: set muxer packet duration based on framerate only for CFR
...
a set ost->frame_rate does not imply CFR in ffmpeg
The changed fate tests had all wrong packet durations
(like 1/1000 or 1/90000)
There might be more cases in which is_cfr could be set
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Hendrik Leppkes
9ffc61b125
Merge commit '8ad5124b7ecf7f727724e270a7b4bb8c7bcbf6a4'
...
* commit '8ad5124b7ecf7f727724e270a7b4bb8c7bcbf6a4':
movenc: Automatically flush after writing the initial moov
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
1f185ed897
Merge commit 'db9b7321d5dfcbaf521d46beec44cf724776c70d'
...
* commit 'db9b7321d5dfcbaf521d46beec44cf724776c70d':
vsrc_color: implement frame rate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
51a3e52593
Merge commit '1339009c4924a20e872aa62897097bf5d071157c'
...
* commit '1339009c4924a20e872aa62897097bf5d071157c':
vf_showinfo: show timebase & framerate too
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
1b86a6bb2c
Merge commit '11f87ca71e9c7b917f594194f827fd040d1df5ca'
...
* commit '11f87ca71e9c7b917f594194f827fd040d1df5ca':
vf_frei0r: also set AVFilterLink.frame_rate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
1cb78a0dcf
Merge commit '7d12cba95ca15198a930c05458dc414ac00c578b'
...
* commit '7d12cba95ca15198a930c05458dc414ac00c578b':
vf_framepack: Check and update frame_rate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
b2a8c8538d
Merge commit '65e73bc60f98dc7b26c687e145dfb755d3f2ccfa'
...
* commit '65e73bc60f98dc7b26c687e145dfb755d3f2ccfa':
vf_interlace: implement frame rate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
ef636aacf5
Merge commit '018bdaed37d2f1735dbecfc58309a1a164abadd5'
...
* commit '018bdaed37d2f1735dbecfc58309a1a164abadd5':
setpts: add FRAME_RATE constant
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
3ce3973e5c
Merge commit '5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f'
...
* commit '5e91a5c5cf1db88f254b4c358eb1b06ff6ca274f':
testsrc: set output framerate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
cb98712866
Merge commit '9df477e03ef74068f3de130adc4dd34349a16ef2'
...
* commit '9df477e03ef74068f3de130adc4dd34349a16ef2':
yadif: update frame rate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
4e8f1c6fb0
Merge commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41'
...
* commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41':
vf_fps: set frame_rate.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
6375ba827a
Merge commit '61fb67dcb2e71a268c422fc19d366040e59fb337'
...
* commit '61fb67dcb2e71a268c422fc19d366040e59fb337':
buffersrc: accept the frame rate as argument.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
0b73d0ff0d
Merge commit '48ff6683ba5d40b629428673b1028e8ec542a9fa'
...
* commit '48ff6683ba5d40b629428673b1028e8ec542a9fa':
lavfi: add a frame_rate field to AVFilterLink.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
b33d58c31f
Merge commit '79f5347a983342e2711ca8ba19ec3d8d151183f0'
...
* commit '79f5347a983342e2711ca8ba19ec3d8d151183f0':
avcodec: fix doxy placement
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
611c22140a
Merge commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8'
...
* commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8':
lavf: deprecate compute_pkt_fields2
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
c03ffe1712
avformat/utils: re-factor freeing AVStreams
...
This matches the Libav signature and simplifies merging future changes.
9 years ago
Paul B Mahol
2905c51204
avformat/rsd: XMA2 is actually stored, not XMA1
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Michael Niedermayer
8f3a960353
ffmpeg_filter: remove redundant null ptr check
...
Fixes: CID1338331
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
1b539fbfe3
avfilter/avf_showcqt: Fix uninitialized return code
...
Fixes CID1322329
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Michael Niedermayer
4819446eae
avcodec/webvttdec: Fix uninitialized use of variable "again"
...
Fixes CID1338336
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Andreas Cadhalpun
f621749d11
dvdsubdec: validate offset2 similar to offset1
...
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>
9 years ago
Matt Oliver
9105399060
avutil/x86/intmath: Disable use of tzcnt on older intel compilers.
...
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>
9 years ago
Bryan Huh
85e3c31fd5
avformat/mov: Add option to ignore chapters during parsing
...
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>
9 years ago
Michael Niedermayer
d9726893f3
avformat/mxfenc: Only store user comment related tags when needed
...
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>
9 years ago
Ni Hui
3ea60c505f
avcodec/gifdec: skip the data lzw consumed
...
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>
9 years ago
Ni Hui
c75640e9c9
avcodec/lzw: ff_lzw_decode_tail() now returns the consumed bytes in lzw decompress
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Andreas Cadhalpun
7b67fe20f6
brstm: reject negative sample rate
...
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>
9 years ago
Paul B Mahol
9c66428016
avcodec/wmaprodec: XMA1 actually have packet sequence numbers
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Martin Storsjö
8ad5124b7e
movenc: Automatically flush after writing the initial moov
...
In most other cases when writing fragmented mp4 files, the output
IO context is flushed after each fragment. Also flush it after
writing the initial moov, to have it behave in the same way.
Signed-off-by: Martin Storsjö <martin@martin.st>
9 years ago
Paul B Mahol
5b349c8d7c
aviflter/vf_waveform: speed up non-color filters
...
Remove loops, output is also more interesting.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Paul B Mahol
4e583eda5f
avformat/wavdec: allow data chunk to be before fmt/xma2 chunk
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Paul B Mahol
a0f75c46d3
avformat/wavdec: parse XMA2 tag
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
Hendrik Leppkes
3df9ec5ce7
Merge commit 'aeda1121c91395d1f0d434bc7f227423aa2ff97d'
...
* commit 'aeda1121c91395d1f0d434bc7f227423aa2ff97d':
lavf: factor out freeing an AVStream
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
d3d4bc4784
Merge commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4'
...
* commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4':
avconv: set packet duration for CFR video streams
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
de0e219a8a
Merge commit 'a0c71a575109f123978e345fa7eb4ac03cd4d3c3'
...
* commit 'a0c71a575109f123978e345fa7eb4ac03cd4d3c3':
lavf: initialize cur_dts to AV_NOPTS_VALUE for muxing
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
23277aa24c
Merge commit 'cc96018c79cd4dc823e0cef938da2131e4660fe5'
...
* commit 'cc96018c79cd4dc823e0cef938da2131e4660fe5':
libopenh264enc: Set AVOption data type
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
947447bfdc
Merge commit 'fcc49924db6c5530a3346c45a6999244d92eaf48'
...
* commit 'fcc49924db6c5530a3346c45a6999244d92eaf48':
vdpau: Remove a spurious CONFIG_H263_VDPAU_HWACCEL
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
42a088784b
Merge commit '563e6d860391bac0511984e5c0842320b5c94d2d'
...
* commit '563e6d860391bac0511984e5c0842320b5c94d2d':
segafilm: drop the "song and dance" for cinepak
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
0e29820cd1
Merge commit '1e791ee3aae63122afb10cbabe86a747aea58992'
...
* commit '1e791ee3aae63122afb10cbabe86a747aea58992':
segafilm: set video and audio stream duration
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
b3453f44ed
Merge commit 'c012c6f1a8b34828a7870dc1854422934f14b79a'
...
* commit 'c012c6f1a8b34828a7870dc1854422934f14b79a':
segafilm: implement seeking
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
43266457b4
Merge commit '2ec112f71cd03ccab1b6f9a00d29199a57bcc7a5'
...
* commit '2ec112f71cd03ccab1b6f9a00d29199a57bcc7a5':
vf_pad: fix x, y option expression evaluation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
240ac53a5c
Merge commit 'e2854e731f843906d9a9a5b882bed872341999fd'
...
* commit 'e2854e731f843906d9a9a5b882bed872341999fd':
avresample: Document avresample_open() a little better
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
df06cb5611
Merge commit 'f128b8e19ac7f702adae899ab91cc1e80f238761'
...
* commit 'f128b8e19ac7f702adae899ab91cc1e80f238761':
mov: detect cover art pictures by content
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
3a8b37c590
Merge commit '50d2a3b5f34e6f99e5ffe17f2be5eb1815555960'
...
* commit '50d2a3b5f34e6f99e5ffe17f2be5eb1815555960':
flashsv: Initialize the block array
Not merged, blocks are already zeroed when appropriate.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
0c1a6f577b
Merge commit 'de41b555cdea2dcacbe98ee9edc83a8c15c73c4c'
...
* commit 'de41b555cdea2dcacbe98ee9edc83a8c15c73c4c':
truemotion2: Fix the buffer check
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
446ac80ea5
Merge commit '4a326923381f2bc0fb7d960c8f8366a5456bc4ab'
...
* commit '4a326923381f2bc0fb7d960c8f8366a5456bc4ab':
mimic: Always return on failure
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
b40e43c5c4
Merge commit '452d659aa4a742106c70ffe9ef3df47ef5b81ea6'
...
* commit '452d659aa4a742106c70ffe9ef3df47ef5b81ea6':
msnwc_tcp: Use the correct return values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
618817b6a8
Merge commit 'f8d10511fef0bb3265f2d7bdfd38f90f60731d80'
...
* commit 'f8d10511fef0bb3265f2d7bdfd38f90f60731d80':
cosmetics: msnwc_tcp: Reformat
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
2e82d51714
Merge commit '4dfbc7a7559ccab666a8fd39de4224eb4b02c768'
...
* commit '4dfbc7a7559ccab666a8fd39de4224eb4b02c768':
msnwc_tcp: Correctly report failure
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Hendrik Leppkes
8600fef123
Merge commit '60f50374f1955442dc987abc4a6c61c2109620c2'
...
* commit '60f50374f1955442dc987abc4a6c61c2109620c2':
rpza: Check the blocks left before processing one
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago