ffmpeg.git
7 years agolavfi/overlay: improve log message warning in case of clipped overlay
Stefano Sabatini [Tue, 19 Feb 2013 18:03:30 +0000 (19:03 +0100)]
lavfi/overlay: improve log message warning in case of clipped overlay

7 years agolavfi/overlay: add support for partial overlaying
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.

7 years agolavfi/mp: drop mp=stereo3d filter
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>
7 years agolavfi: port MP stereo3d filter
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>
7 years agolavf/concat: compute duration if possible.
Nicolas George [Wed, 13 Feb 2013 18:25:26 +0000 (19:25 +0100)]
lavf/concat: compute duration if possible.

7 years agoexamples/muxing: fix memory leak.
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.

7 years agolavu/eval: add native support to lte and lt functions
Stefano Sabatini [Tue, 5 Mar 2013 12:39:27 +0000 (13:39 +0100)]
lavu/eval: add native support to lte and lt functions

7 years agodoc/muxers: specify that tee needs -map.
Nicolas George [Thu, 28 Feb 2013 18:42:21 +0000 (19:42 +0100)]
doc/muxers: specify that tee needs -map.

Address trac ticket #2311.

7 years agoRevert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"
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.

7 years agolavu/opt: fix weird align
Stefano Sabatini [Mon, 4 Mar 2013 17:38:45 +0000 (18:38 +0100)]
lavu/opt: fix weird align

7 years agolavu/opt-test: do not explicitly set default value in test_ctx
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.

7 years agotests: add overlay rgb and yuv444 tests
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.

7 years agomp3dec: Fix VBR bit rate parsing
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>
7 years agofate: add dependency for xface
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>
7 years agoMerge remote-tracking branch 'qatar/master'
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>
7 years agoMerge commit '9c7d85b3b45a77742b1e69c48ab33f9c8a2e6f35'
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>
7 years agoMerge commit 'f868b24d0f280bb966e5c352028a343e45d20a02'
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>
7 years agoMerge commit '813b82b927b19532e3bc3397b972c8a27b9f6326'
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>
7 years agozmbv: stop doing colorspace conversion
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>
7 years agodoc/filters: fix short options for noise filter
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>
7 years agoconfigure: Use check_builtin() where appropriate
Diego Biurrun [Mon, 4 Mar 2013 22:02:02 +0000 (23:02 +0100)]
configure: Use check_builtin() where appropriate

7 years agoconfigure: Add check_builtin convenience function
Diego Biurrun [Mon, 4 Mar 2013 21:59:41 +0000 (22:59 +0100)]
configure: Add check_builtin convenience function

7 years agoconfigure: Add sanitize_var_name 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.

7 years agoconfigure: Fix silly typo in logging command of check_struct()
Diego Biurrun [Mon, 4 Mar 2013 21:56:41 +0000 (22:56 +0100)]
configure: Fix silly typo in logging command of check_struct()

7 years agoMerge remote-tracking branch 'cehoyos/master'
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>
7 years agomsrledec: fix output_end checks
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>
7 years agoiff: fix integer overflow
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>
7 years agoAdd h264chroma dependency for mpegvideo / lowres to configure.
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.

7 years agoupdate_stream_timings: check bitrate for being in range.
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>
7 years agodnxhddec: return the correct number of bytes from decode_frame
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>
7 years agoavformat: Make duration estimation from pts more robust
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>
7 years agonutdec: more specific return codes for decode_syncpoint()
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>
7 years agonutdec: print error on invalid/unsupported fourcc style
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>
7 years agoMerge remote-tracking branch 'cehoyos/master'
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>
7 years agobuild: [autodetect] -> [no] in iconv help.
Clément Bœsch [Mon, 4 Mar 2013 12:12:25 +0000 (13:12 +0100)]
build: [autodetect] -> [no] in iconv help.

7 years agobuildsys: only include log2_tab per library for shared builds
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>
7 years agoAdd h264chroma dependency for cavs decoder to configure.
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.

7 years agoAdd h264qpel dependency for snow codec to configure.
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.

7 years agoAdd h264chroma dependency for vp5 and vp6 decoder to configure.
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.

7 years agofate: remove last incomplete frame from mpeg2-field-enc test
Janne Grunau [Mon, 4 Mar 2013 09:18:21 +0000 (10:18 +0100)]
fate: remove last incomplete frame from mpeg2-field-enc test

7 years agocompat/strtod: isspace -> av_isspace.
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.

7 years agobuild: disable iconv by default.
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.

7 years agodoc/filters: fix degrees/radians copy/paste fail.
Clément Bœsch [Sun, 3 Mar 2013 22:49:46 +0000 (23:49 +0100)]
doc/filters: fix degrees/radians copy/paste fail.

7 years agoffmpeg_opt: Ask for overwrite in single image2 files too
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>
7 years agolavfi/opencv: isgraph -> av_isgraph.
Clément Bœsch [Sun, 3 Mar 2013 21:06:48 +0000 (22:06 +0100)]
lavfi/opencv: isgraph -> av_isgraph.

Fix build after 88d55b8.

7 years agoRemove incorrect use of ctype.h functions.
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>
7 years agoDeprecate deinterlaced in libavcodec.
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>
7 years agoffmpeg: fix -stats -v 0
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>
7 years agoavformat: gather aspect ratio from rv30/40 in find_stream_info
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>
7 years agorv34: fix aspect ratio
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>
7 years agowmadec: check nb_frames
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>
7 years agoMerge remote-tracking branch 'cehoyos/master'
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>
7 years agoh264: put call to ff_print_debug_info2 under CONFIG_MPEGVIDEO.
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>
7 years agoh264: make it possible to compile without error_resilience.
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>
7 years agomovenc: Do not flag secondary audio and subtitle tracks as enabled.
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>
7 years agoMerge remote-tracking branch 'qatar/master'
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>
7 years agoh264: add a copy of draw_horiz_band.
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>
7 years agolibxvid: cleanup on error pathes
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>
7 years agolibxvid: check & clear encoder_handle
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>
7 years agolibxvid: use av_freep() for saftey
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>
7 years agolibxvid: remove temporary files at the end
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>
7 years agortpdec: Initialize some variables to silence compiler warnings
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>
7 years agomjpegdec: fix endiansoup
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>
7 years agoAvoid huge memory allocations from asf demuxer.
Carl Eugen Hoyos [Sat, 2 Mar 2013 17:37:55 +0000 (18:37 +0100)]
Avoid huge memory allocations from asf demuxer.

Fixes ticket #1888.

7 years agolavc/flacdec: Add frame CRC calculation
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>
7 years agoffmpeg: print maxrss "-benchmark" data even on errors
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>
7 years agoer: Fix slice threading check
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>
7 years agoMerge remote-tracking branch 'qatar/master'
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>
7 years agoMerge commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'
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>
7 years agoMerge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'
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>
7 years agoMerge commit 'c91c63b5380bf79655c09320774a022f84d76fd5'
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>
7 years agoh264: set ref_count to 0 for intra slices.
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

7 years agoh264: on reference overflow, reset the reference count to 0, not 1.
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

7 years agoh264: do not copy ref count/ref2frm when updating per-frame context
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.

7 years agov4l2: fix regression that caused ffmpeg to occasionally get stuck
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>
7 years agolavd/v4l2: copy frames into normally allocated packets whenever there is just one...
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>
7 years agoflvdec: Check the return value of a malloc
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>
7 years agoflvdec: Don't read the VP6 header byte when setting codec type based on metadata
Martin Storsjö [Fri, 1 Mar 2013 14:30:44 +0000 (16:30 +0200)]
flvdec: Don't read the VP6 header byte when setting codec type based on metadata

This header byte is only present when actually reading a VP6 frame,
not when reading the codec type field in the metadata. This
potential bug has been present since 5b54a90c.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoffplay: use AVFrame accessor functions
Michael Niedermayer [Fri, 1 Mar 2013 21:22:48 +0000 (22:22 +0100)]
ffplay: use AVFrame accessor functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/utils: use AVFrame accessor functions
Michael Niedermayer [Fri, 1 Mar 2013 21:26:53 +0000 (22:26 +0100)]
avcodec/utils: use AVFrame accessor functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/rawdec: use AVFrame accessor functions
Michael Niedermayer [Fri, 1 Mar 2013 21:25:09 +0000 (22:25 +0100)]
avcodec/rawdec: use AVFrame accessor functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopngdec: use AVFrame accessor functions
Michael Niedermayer [Fri, 1 Mar 2013 21:24:56 +0000 (22:24 +0100)]
pngdec: use AVFrame accessor functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogifdec: use AVFrame accessor functions
Michael Niedermayer [Fri, 1 Mar 2013 21:24:41 +0000 (22:24 +0100)]
gifdec: use AVFrame accessor functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocpia: use AVFrame accessor functions
Michael Niedermayer [Fri, 1 Mar 2013 21:24:30 +0000 (22:24 +0100)]
cpia: use AVFrame accessor functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotiff: use AVFrame accessor functions
Michael Niedermayer [Fri, 1 Mar 2013 21:24:22 +0000 (22:24 +0100)]
tiff: use AVFrame accessor functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoac3dec: use AVFrame accessor functions
Michael Niedermayer [Fri, 1 Mar 2013 21:23:54 +0000 (22:23 +0100)]
ac3dec: use AVFrame accessor functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffprobe: use AVFrame accessor functions
Michael Niedermayer [Fri, 1 Mar 2013 21:23:38 +0000 (22:23 +0100)]
ffprobe: use AVFrame accessor functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/examples/demuxing: use AVFrame accessor functions
Michael Niedermayer [Fri, 1 Mar 2013 21:03:42 +0000 (22:03 +0100)]
doc/examples/demuxing: use AVFrame accessor functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: add ff_frame_get_metadatap()
Michael Niedermayer [Fri, 1 Mar 2013 21:26:12 +0000 (22:26 +0100)]
avcodec: add ff_frame_get_metadatap()

This is needed for av_dict_*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/codec_desc: add/fix .props for SGI/DPX/X-face/BRender PIX image
Paul B Mahol [Fri, 1 Mar 2013 15:22:02 +0000 (15:22 +0000)]
lavc/codec_desc: add/fix .props for SGI/DPX/X-face/BRender PIX image

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoHandle an invalid extra mpeg2 picture header following a frame-encoded picture.
Joseph Artsimovich [Fri, 1 Mar 2013 13:37:28 +0000 (13:37 +0000)]
Handle an invalid extra mpeg2 picture header following a frame-encoded picture.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosgidec: use unchecked bytestream2 functions where it makes sense
Paul B Mahol [Fri, 1 Mar 2013 14:54:34 +0000 (14:54 +0000)]
sgidec: use unchecked bytestream2 functions where it makes sense

Overreads can not happen as header size of 512 bytes is required.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosoxr: libsoxr 0.1.1 support
Rob Sykes [Fri, 1 Mar 2013 13:29:14 +0000 (14:29 +0100)]
soxr: libsoxr 0.1.1 support

Libsoxr 0.1.1 will be out very soon; no changes planned beyond what's currently in git.
It includes a couple of fixes (not affecting FFmpeg's current usage) and a minor API change (but remains ABI compatible).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexr: use bytestream functions in pxr24_uncompress()
Paul B Mahol [Fri, 1 Mar 2013 13:10:22 +0000 (13:10 +0000)]
exr: use bytestream functions in pxr24_uncompress()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 1 Mar 2013 12:50:05 +0000 (13:50 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lls: Do not return from void functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'
Michael Niedermayer [Fri, 1 Mar 2013 12:44:27 +0000 (13:44 +0100)]
Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'

* commit '4da950c0ae224b9b8ef952dadf614be2c050023e':
  lls: #ifndef --> #if in FF_API_ version guard

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'
Michael Niedermayer [Fri, 1 Mar 2013 12:39:47 +0000 (13:39 +0100)]
Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'

* commit 'e8c52271c45ec27d783e74238dcfad0c2008731c':
  Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."

Conflicts:
libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '399663be9d4a839b894c48a21b62926eb8497d72'
Michael Niedermayer [Fri, 1 Mar 2013 12:32:12 +0000 (13:32 +0100)]
Merge commit '399663be9d4a839b894c48a21b62926eb8497d72'

* commit '399663be9d4a839b894c48a21b62926eb8497d72':
  lls: mark max_order as unsigned short

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9d4da474f5f40b019cb4cb931c8499deee586174'
Michael Niedermayer [Fri, 1 Mar 2013 12:19:00 +0000 (13:19 +0100)]
Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'

* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
  lls: move to the private namespace

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282'
Michael Niedermayer [Fri, 1 Mar 2013 12:02:57 +0000 (13:02 +0100)]
Merge commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282'

* commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282':
  lls: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>