Michael Niedermayer
a5d67bc796
avformat/utils: Fix bitrate overflow check
...
The check added in df33a58e53
does not work
at all, rather it broke the summing of bitrates completely.
The comparission was wrong way around.
This commit replaces it by a simpler and hopefully clearer check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d07d54fd56
Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'
...
* commit 'df33a58e5311ee9a64a573889b883a80e981af7b':
lavf: avoid integer overflow when estimating bitrate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b0ba2bf8c6
Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'
...
* commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303':
lavf: move a variable declaration to the block where it's used
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Compn
8d14596bc2
riff: add 0x64 to g726 works on g726-test1.wav
11 years ago
Michael Niedermayer
1eb151c501
Merge commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a'
...
* commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a':
pictordec: pass correct context to avpriv_request_sample
Conflicts:
libavcodec/pictordec.c
No change as the avpriv_request_sample() has already been replaced by an implementation
of the codepath.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
efb21b0a8f
Merge commit '5f7aecde02a95451e514c809f2794c1deba80695'
...
* commit '5f7aecde02a95451e514c809f2794c1deba80695':
pictordec: break out of both decoding loops when y drops below 0
Conflicts:
libavcodec/pictordec.c
The added check is redundant.
It shows the error path more clearly though
See: f3f488423a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
164b67ca28
avcodec/vcr1: replace redundant checks from libav ( 8aba7968dd
) by asserts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8ba683e629
Merge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30'
...
* commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30':
vcr1: add sanity checks
Conflicts:
libavcodec/vcr1.c
See: 845724c82c
See: 8e09482e4d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
92b7e7b318
avfilter/vf_yadif: reallocate frames if strides differ
...
Fixes Ticket2896
An alternative to this would be to change the code to support any
stride.
The condition of differing strides should be rare.
If theres no speedloss supporting any stride would be better
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cc84f30402
avutil/fifo: assert that theres enough data in the fifo on drain calls.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
3e36dc8626
w64dec: fix end position of summarylist guid
...
Noticed-by: James Almer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
79b70e47a4
w64dec: fix skipping of unknown guids
...
Regression since 14d50c1
.
Fixes #2932 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Vignesh Venkatasubramanian
fdd1aaf87a
avpacket: Fixing side data copy when src == dst
...
Fixing av_packet_copy_side_data to work correctly when source and
destination are the same. This makes sure that there is no memory
leak and double frees.
Signed-off by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
df33a58e53
lavf: avoid integer overflow when estimating bitrate
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
11 years ago
Anton Khirnov
fab694dd39
lavf: move a variable declaration to the block where it's used
11 years ago
Anton Khirnov
fe9bb61f9a
pictordec: pass correct context to avpriv_request_sample
...
Fixes invalid reads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
11 years ago
Anton Khirnov
5f7aecde02
pictordec: break out of both decoding loops when y drops below 0
...
Otherwise picmemset can get called with negative y, resulting in an
invalid write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
11 years ago
Anton Khirnov
8aba7968dd
vcr1: add sanity checks
...
Fixes invalid reads with corrupted files.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
11 years ago
Michael Niedermayer
2501f6d3d6
avformat/movenc: Use the rate from av_timecode_init_from_string() for tmcd
...
Fixes Ticket2892
Reveiwed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4fb3e1a652
avcodec/pnmdec: fix unaligned read
...
Fixes fate-lavf-pam on alpha
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
62d07bb321
avcodec/pnmdec: use a more specific pointer type than void in samplecpy()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
ec8a4841f7
Avoid a deadlock when decoding wma.
...
Fixes ticket #2925 .
11 years ago
Michael Niedermayer
cdd5df8189
avfilter/vf_fps: make sure the fifo is not empty before using it
...
Fixes Ticket2905
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Marton Balint
b339dccbba
lavc: add teletext decoder using libzvbi
...
Based on a patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-December/136677.html
The original patch was rebased by Tudor SUCIU <tudor.suciu@gmail.com>.
Lots of additional features and fixes are made by me.
Fixes ticket #2086 .
Changes since last version:
- change default page to all pages
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cf94299448
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Read h264 headers from v4l2 to allow stream-copying.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
21dc3a3cc2
avcodec/ffv1dec: reorganize thread init/update
...
This moves some allocations to init, reducing possible failure modes in update.
Always copies from the previous context instead of just during init
Fixes Ticket2923
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c72cca5a44
avcodec/ffv1dec: move initial_states init to init_thread_copy()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
e337c9d564
Read h264 headers from v4l2 to allow stream-copying.
...
Fixes ticket #2882 .
Analyzed and tested by William C Bonner.
11 years ago
Paul B Mahol
5be7aecc80
pcm-dvd: use av_freep()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
fc435d977a
pcm-dvd: remove redundant log message
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
91acb23a28
doc: fix insane hard texi2html dependancy
...
Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4aeb996f71
pixfmt: add native bayer 16bit formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Peter Ross
9116995efb
libavutil: add AV_PIX_FMT_BAYER pixel formats
...
The pixel format descriptors are set to more or less arbitrary
values as bayer formats do not fit in the descriptors structure.
These values are currently not used for bayer formats and thus
do not matter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8901f48e63
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pcm-dvd: Fix build on big endian
See: 789cd1de99
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d8809b357c
Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'
...
* commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c':
configure: Add docdir configuration option
Conflicts:
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
67d7ea9825
Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'
...
* commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce':
vf_lut: Constantize
Conflicts:
libavfilter/vf_lut.c
See: d7e95ccd9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7c1805869d
avcodec/pcm-dvd: discard buffer if block size changed
...
This prevents a potential crash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Martin Storsjö
789cd1de99
pcm-dvd: Fix build on big endian
...
Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cb4d05e7f2
Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'
...
* commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9':
pcm_dvd: consolidate pieces from pcm.c and mpeg.c
Conflicts:
libavcodec/pcm.c
libavcodec/version.h
libavformat/mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d7f917c37a
fate: update fate tests after master:291ad12ea2d1: ffprobe: show probe_score in the format section
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Stefano Sabatini
291ad12ea2
ffprobe: show probe_score in the format section
...
Should address trac ticket #2621 .
11 years ago
Stefano Sabatini
51b01573e5
ffprobe: fix format section XML validation
...
It was broken since 2186a7e547
.
11 years ago
Michael Niedermayer
93cf7b0195
avcodec/h264: set er.ref_count earlier
...
Fixes Ticket2910
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
990bbc15b8
avcodec/error_resilience: change out commented printf() to av_log()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0388203098
avformat/utils: fix duration_fields calculation when need_parsing=0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8349be852b
avformat/lxfdec: use a parser to parse video frame headers
...
lxf needs a parser (or would need to set a few fields explicitly).
Fixes Ticket2917
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Martin Storsjö
21ffd41011
pcm-dvd: Fix build on big endian
...
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Michael Niedermayer
8da23be458
avcodec/utils: avcodec_string: print colorspace type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ea07dbdeaa
avcodec/utils: avcodec_string: Print color_range
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
336982a0ce
avcodec/utils: avcodec_string: make the colorspace printing code more extendible.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago