OSDN Git Service
Michael Niedermayer [Wed, 6 Mar 2013 18:26:40 +0000 (19:26 +0100)]
snowenc: add forgotten emms_c()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 5 Mar 2013 16:14:27 +0000 (17:14 +0100)]
lavf/concat: document the use of the files durations.
Address trac ticket #2319.
Michael Niedermayer [Wed, 6 Mar 2013 15:35:47 +0000 (16:35 +0100)]
snowenc: initialize edges
This fixes a regression caused by changes to the buffer initialization code.
Fixes valgrind warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Mar 2013 12:45:53 +0000 (13:45 +0100)]
vc1dec: use av_log_ask_for_sample for odd sprites
Suggested-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 6 Mar 2013 10:42:10 +0000 (10:42 +0000)]
libilbc: use ff_alloc_packet2
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Zern [Tue, 5 Mar 2013 21:19:03 +0000 (13:19 -0800)]
libopusenc: use ff_alloc_packet2
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 6 Mar 2013 09:34:14 +0000 (10:34 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice
Conflicts:
libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Mar 2013 04:37:09 +0000 (05:37 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Move the iconv test to the bottom of configure.
Make 32bit zmbv colour-space opaque.
Use uint8_t instead of uint16_t pointer in kega decoder.
kgv1dec: Simplify kega decoding by using memcpy instead of loops
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Mar 2013 04:04:15 +0000 (05:04 +0100)]
qdm2: check "AC" codewords
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Mar 2013 03:56:33 +0000 (04:56 +0100)]
qdm2: simplify arithmetic coder tables generation
Someone should rename the variables, theres nothing random in there
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Mar 2013 02:10:18 +0000 (03:10 +0100)]
rv20: Fix handling of frame skip.
Fixes division by zero
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Mar 2013 00:37:49 +0000 (01:37 +0100)]
mss2dsp/upsample_plane: fix 0x0 handling
Fixes invalid memcpy and out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 5 Mar 2013 23:57:51 +0000 (00:57 +0100)]
Move the iconv test to the bottom of configure.
This fixes a possible mis-detection of iconv on OS X.
OS X with macports often has two version of libiconv.2.dylib
installed, one with symbols like "_iconv_open" and one with
"_libiconv_open", so test for iconv with all flags to make
sure the detection uses the same library as the actual
compilation / linking.
Tested-by: Paul Sturbaum
Carl Eugen Hoyos [Tue, 5 Mar 2013 23:38:12 +0000 (00:38 +0100)]
Make 32bit zmbv colour-space opaque.
Carl Eugen Hoyos [Tue, 5 Mar 2013 23:35:08 +0000 (00:35 +0100)]
Use uint8_t instead of uint16_t pointer in kega decoder.
This change allows to remove a few casts and avoids
a potential pointer aliasing violation.
Reimar Döffinger [Tue, 5 Mar 2013 23:25:18 +0000 (00:25 +0100)]
kgv1dec: Simplify kega decoding by using memcpy instead of loops
Fixes decoding errors with icc 13.1
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Michael Niedermayer [Tue, 5 Mar 2013 23:03:58 +0000 (00:03 +0100)]
vc1dec: odd sized sprites are unsupported
It should be easy to add support but without a sample we would
not know if they work.
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Mar 2013 20:56:46 +0000 (21:56 +0100)]
asfdec: dont truncate type 2-5 values
Fixes use of uninitialized variables and possible out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Mar 2013 21:29:17 +0000 (22:29 +0100)]
vf_stereo3d: Add AVOption table terminator
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 5 Mar 2013 19:16:51 +0000 (20:16 +0100)]
lavfi/deshake: support named options.
Clément Bœsch [Tue, 5 Mar 2013 20:08:16 +0000 (21:08 +0100)]
doc/filters: make examples a bit more consistent.
Create dedicated subsection and itemize. Not done for every filters, but
a large part is done.
Clément Bœsch [Tue, 5 Mar 2013 19:37:58 +0000 (20:37 +0100)]
doc/showspectrum: add some examples.
Stefano Sabatini [Tue, 19 Feb 2013 18:03:30 +0000 (19:03 +0100)]
lavfi/overlay: improve log message warning in case of clipped overlay
Stefano Sabatini [Tue, 5 Mar 2013 18:38:15 +0000 (19:38 +0100)]
lavfi/overlay: add support for partial overlaying
Partially rework the iteration logic, in order to limit iteration only
for the clipped overlay region.
Paul B Mahol [Tue, 5 Mar 2013 18:45:35 +0000 (18:45 +0000)]
lavfi/mp: drop mp=stereo3d filter
The filter has been natively integrated into libavfilter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 1 Mar 2013 17:35:52 +0000 (17:35 +0000)]
lavfi: port MP stereo3d filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Wed, 13 Feb 2013 18:25:26 +0000 (19:25 +0100)]
lavf/concat: compute duration if possible.
Nicolas George [Tue, 5 Mar 2013 14:19:47 +0000 (15:19 +0100)]
examples/muxing: fix memory leak.
Do not re-call avcodec_get_context_defaults3(), it is already
called by avformat_new_stream() and it leaks the codec
priv_data that was already allocated.
Use avformat_free_context() instead of freeing (not)
everything manually.
Fix trac ticket #2322.
Stefano Sabatini [Tue, 5 Mar 2013 12:39:27 +0000 (13:39 +0100)]
lavu/eval: add native support to lte and lt functions
Nicolas George [Thu, 28 Feb 2013 18:42:21 +0000 (19:42 +0100)]
doc/muxers: specify that tee needs -map.
Address trac ticket #2311.
Nicolas George [Tue, 5 Mar 2013 13:10:10 +0000 (14:10 +0100)]
Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"
This reverts commit
6cc12353a88dfb21c4c5a38e6c83280483b0ec88.
Conflicts:
libavformat/version.h
Allowing to automatically select the concat demuxer raises
security concerns, as it allows a possibly hostile file to
access any file on the system. Guessing the format based on
the file name extension does not allow to enable the safe
mode designed to avoid it.
Stefano Sabatini [Mon, 4 Mar 2013 17:38:45 +0000 (18:38 +0100)]
lavu/opt: fix weird align
Stefano Sabatini [Mon, 4 Mar 2013 17:34:35 +0000 (18:34 +0100)]
lavu/opt-test: do not explicitly set default value in test_ctx
Let av_opt_set_defaults() set the value, which is simpler and more
idiomatic.
Stefano Sabatini [Tue, 5 Mar 2013 00:42:00 +0000 (01:42 +0100)]
tests: add overlay rgb and yuv444 tests
Also rename overlay test to overlay_yuv420 accordingly.
Alexander Kojevnikov [Wed, 27 Feb 2013 05:47:11 +0000 (21:47 -0800)]
mp3dec: Fix VBR bit rate parsing
When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.
When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.
Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 5 Mar 2013 11:39:55 +0000 (11:39 +0000)]
fate: add dependency for xface
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 5 Mar 2013 11:37:15 +0000 (12:37 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Use check_builtin() where appropriate
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Mar 2013 11:23:38 +0000 (12:23 +0100)]
Merge commit '
9c7d85b3b45a77742b1e69c48ab33f9c8a2e6f35'
* commit '
9c7d85b3b45a77742b1e69c48ab33f9c8a2e6f35':
configure: Add check_builtin convenience function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Mar 2013 11:17:10 +0000 (12:17 +0100)]
Merge commit '
f868b24d0f280bb966e5c352028a343e45d20a02'
* commit '
f868b24d0f280bb966e5c352028a343e45d20a02':
configure: Add sanitize_var_name convenience function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Mar 2013 11:11:48 +0000 (12:11 +0100)]
Merge commit '
813b82b927b19532e3bc3397b972c8a27b9f6326'
* commit '
813b82b927b19532e3bc3397b972c8a27b9f6326':
configure: Fix silly typo in logging command of check_struct()
fate: remove last incomplete frame from mpeg2-field-enc test
Conflicts:
tests/fate/video.mak
tests/ref/fate/mpeg2-field-enc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 2 Mar 2013 18:15:37 +0000 (18:15 +0000)]
zmbv: stop doing colorspace conversion
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Fri, 22 Feb 2013 20:25:00 +0000 (21:25 +0100)]
hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice
Some hwaccels use name prefixes, some do not, others only use them for
some codecs. Add prefixes everywhere for consistency.
Paul B Mahol [Tue, 5 Mar 2013 10:18:21 +0000 (10:18 +0000)]
doc/filters: fix short options for noise filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Mon, 4 Mar 2013 22:02:02 +0000 (23:02 +0100)]
configure: Use check_builtin() where appropriate
Diego Biurrun [Mon, 4 Mar 2013 21:59:41 +0000 (22:59 +0100)]
configure: Add check_builtin convenience function
Diego Biurrun [Mon, 4 Mar 2013 21:58:34 +0000 (22:58 +0100)]
configure: Add sanitize_var_name convenience function
This is useful in all the places where special characters in
variable names are manually translated to underscores.
Diego Biurrun [Mon, 4 Mar 2013 21:56:41 +0000 (22:56 +0100)]
configure: Fix silly typo in logging command of check_struct()
Michael Niedermayer [Tue, 5 Mar 2013 03:24:57 +0000 (04:24 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Add h264chroma dependency for mpegvideo / lowres to configure.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Mar 2013 01:19:12 +0000 (02:19 +0100)]
msrledec: fix output_end checks
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Mar 2013 00:35:28 +0000 (01:35 +0100)]
iff: fix integer overflow
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 5 Mar 2013 00:07:12 +0000 (01:07 +0100)]
Add h264chroma dependency for mpegvideo / lowres to configure.
Fix building for some unusual configurations.
Michael Niedermayer [Mon, 4 Mar 2013 17:54:00 +0000 (18:54 +0100)]
update_stream_timings: check bitrate for being in range.
Fixes numerical overflow
Fixes Ticket2089
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Mar 2013 17:17:47 +0000 (18:17 +0100)]
dnxhddec: return the correct number of bytes from decode_frame
Fixes Ticket2022
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Mar 2013 17:01:32 +0000 (18:01 +0100)]
avformat: Make duration estimation from pts more robust
Ignore durations which differ significantly from the previous
Fixes Ticket2018
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Mar 2013 15:51:21 +0000 (16:51 +0100)]
nutdec: more specific return codes for decode_syncpoint()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Mar 2013 15:49:17 +0000 (16:49 +0100)]
nutdec: print error on invalid/unsupported fourcc style
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Mar 2013 13:45:48 +0000 (14:45 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
buildsys: only include log2_tab per library for shared builds
Add h264chroma dependency for cavs decoder to configure.
Add h264qpel dependency for snow codec to configure.
Add h264chroma dependency for vp5 and vp6 decoder to configure.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 4 Mar 2013 12:12:25 +0000 (13:12 +0100)]
build: [autodetect] -> [no] in iconv help.
Michael Niedermayer [Mon, 4 Mar 2013 11:25:02 +0000 (12:25 +0100)]
buildsys: only include log2_tab per library for shared builds
Fix linking failures with -all_load due to multiple log2_tabs
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:43:55 +0000 (11:43 +0100)]
Add h264chroma dependency for cavs decoder to configure.
Fix building for some unusual configurations.
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:43:09 +0000 (11:43 +0100)]
Add h264qpel dependency for snow codec to configure.
Fix building for some unusual configurations.
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:39:44 +0000 (11:39 +0100)]
Add h264chroma dependency for vp5 and vp6 decoder to configure.
Fix building for some unusual configurations.
Janne Grunau [Mon, 4 Mar 2013 09:18:21 +0000 (10:18 +0100)]
fate: remove last incomplete frame from mpeg2-field-enc test
Clément Bœsch [Mon, 4 Mar 2013 02:37:36 +0000 (03:37 +0100)]
compat/strtod: isspace -> av_isspace.
This should fix build after
88d55b8.
Clément Bœsch [Sun, 3 Mar 2013 21:48:16 +0000 (22:48 +0100)]
build: disable iconv by default.
It seems to break a lot on MacOS because of a mixup between multiple
iconv libraries. The issue is that the configure check link with no
particular library path (so it uses /usr/lib/libiconv.dylib where all
the symbols are defined). OTOH, the final build might link with extra
library paths, such as the ports lib directory (typically you get
-L/opt/local/lib because of an extra library such as SDL). Whatever this
option position (before or after -liconv), it will try to link with
/opt/local/lib/libiconv.dylib, and the issue is that this version has
the same symbols as the ones in /usr/lib/libiconv.dylib except that they
all start with 'lib' (libiconv_open, libiconv_close, ...). I don't plan
to try to workaround this mess, so any better solution is welcome.
Clément Bœsch [Sun, 3 Mar 2013 22:49:46 +0000 (23:49 +0100)]
doc/filters: fix degrees/radians copy/paste fail.
Michael Niedermayer [Sun, 3 Mar 2013 21:02:22 +0000 (22:02 +0100)]
ffmpeg_opt: Ask for overwrite in single image2 files too
Fixes Ticket1637
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 3 Mar 2013 21:06:48 +0000 (22:06 +0100)]
lavfi/opencv: isgraph -> av_isgraph.
Fix build after
88d55b8.
Reimar Döffinger [Sun, 3 Mar 2013 10:17:50 +0000 (11:17 +0100)]
Remove incorrect use of ctype.h functions.
As far as I can tell the code should not change behaviour
depending on locale in any of these places.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Ronald S. Bultje [Sun, 3 Mar 2013 16:23:08 +0000 (08:23 -0800)]
Deprecate deinterlaced in libavcodec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Mar 2013 18:33:37 +0000 (19:33 +0100)]
ffmpeg: fix -stats -v 0
Fixes Ticket1687
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Mar 2013 17:41:16 +0000 (18:41 +0100)]
avformat: gather aspect ratio from rv30/40 in find_stream_info
Fixes Ticket1550
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Mar 2013 17:14:08 +0000 (18:14 +0100)]
rv34: fix aspect ratio
Fixes part of Ticket1550
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Mar 2013 15:50:47 +0000 (16:50 +0100)]
wmadec: check nb_frames
Improves error message for Ticket968
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Mar 2013 13:04:48 +0000 (14:04 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
movenc: Do not flag secondary audio and subtitle tracks as enabled.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 3 Mar 2013 01:03:38 +0000 (17:03 -0800)]
h264: put call to ff_print_debug_info2 under CONFIG_MPEGVIDEO.
The code is located in mpegvideo, and it's likely that in a minimal
config, we don't want to include debug info anyway.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 3 Mar 2013 00:57:26 +0000 (16:57 -0800)]
h264: make it possible to compile without error_resilience.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 14:57:48 +0000 (15:57 +0100)]
movenc: Do not flag secondary audio and subtitle tracks as enabled.
Fixes ticket #468 and ticket #1174.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Michael Niedermayer [Sun, 3 Mar 2013 10:40:29 +0000 (11:40 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec: Initialize some variables to silence compiler warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 2 Mar 2013 19:22:02 +0000 (11:22 -0800)]
h264: add a copy of draw_horiz_band.
This makes the decoder independent of mpegvideo.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 19:39:38 +0000 (20:39 +0100)]
libxvid: cleanup on error pathes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 19:32:21 +0000 (20:32 +0100)]
libxvid: check & clear encoder_handle
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 19:29:47 +0000 (20:29 +0100)]
libxvid: use av_freep() for saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 19:22:08 +0000 (20:22 +0100)]
libxvid: remove temporary files at the end
Fixes Ticket924
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 2 Mar 2013 11:54:50 +0000 (13:54 +0200)]
rtpdec: Initialize some variables to silence compiler warnings
The warnings are false positives, older gcc versions (such as 4.5)
think the variables can be used uninitialized while they in
practice can't, while newer (4.6) gets it right.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 2 Mar 2013 18:07:41 +0000 (19:07 +0100)]
mjpegdec: fix endiansoup
Fixes Ticket2175
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 2 Mar 2013 17:37:55 +0000 (18:37 +0100)]
Avoid huge memory allocations from asf demuxer.
Fixes ticket #1888.
James Almer [Sat, 16 Feb 2013 09:07:49 +0000 (06:07 -0300)]
lavc/flacdec: Add frame CRC calculation
Fixes ticket #2266
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sat, 2 Mar 2013 15:04:49 +0000 (16:04 +0100)]
ffmpeg: print maxrss "-benchmark" data even on errors
Fixes Ticket2297
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Feb 2013 18:58:14 +0000 (19:58 +0100)]
er: Fix slice threading check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 11:10:52 +0000 (12:10 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: set ref_count to 0 for intra slices.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 10:53:19 +0000 (11:53 +0100)]
Merge commit '
668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'
* commit '
668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8':
h264: on reference overflow, reset the reference count to 0, not 1.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 10:41:31 +0000 (11:41 +0100)]
Merge commit '
e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'
* commit '
e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9':
h264: do not copy ref count/ref2frm when updating per-frame context
flvdec: Check the return value of a malloc
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 10:27:58 +0000 (11:27 +0100)]
Merge commit '
c91c63b5380bf79655c09320774a022f84d76fd5'
* commit '
c91c63b5380bf79655c09320774a022f84d76fd5':
flvdec: Don't read the VP6 header byte when setting codec type based on metadata
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 14 Feb 2013 10:44:33 +0000 (11:44 +0100)]
h264: set ref_count to 0 for intra slices.
CC:libav-stable@libav.org
Anton Khirnov [Thu, 14 Feb 2013 10:43:20 +0000 (11:43 +0100)]
h264: on reference overflow, reset the reference count to 0, not 1.
Since decode_slice_header() returns before the reference lists are
constructed, there are zero valid references.
CC:libav-stable@libav.org
Anton Khirnov [Thu, 14 Feb 2013 10:41:10 +0000 (11:41 +0100)]
h264: do not copy ref count/ref2frm when updating per-frame context
They are filled in decode_slice_header() anyway.
Michael Niedermayer [Sat, 2 Mar 2013 00:51:29 +0000 (01:51 +0100)]
v4l2: fix regression that caused ffmpeg to occasionally get stuck
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Thu, 14 Feb 2013 11:33:49 +0000 (12:33 +0100)]
lavd/v4l2: copy frames into normally allocated packets whenever there is just one buffer left available
This will avoid the possibility that we dequeue more buffers than we
have obtained from the v4l2 driver.
Fixes ticket #1570
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 1 Mar 2013 14:45:24 +0000 (16:45 +0200)]
flvdec: Check the return value of a malloc
The callers of this function can't report errors sanely. If this
one malloc fails, don't write the extradata byte, make sure we
try to malloc it the next time we're called instead, and make sure
we still consume the input data byte.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>