ffmpeg.git
8 years agoffmpeg: remove unneeded ost->picref check.
Clément Bœsch [Mon, 13 Feb 2012 22:24:31 +0000 (23:24 +0100)]
ffmpeg: remove unneeded ost->picref check.

If there ost->picref is NULL, it will likely crash anyway a few lines
below by dereferencing it in order to access video attribute.

8 years agoffmpeg: remove pointless avcodec_get_frame_defaults().
Clément Bœsch [Mon, 13 Feb 2012 22:23:15 +0000 (23:23 +0100)]
ffmpeg: remove pointless avcodec_get_frame_defaults().

filtered_frame is overwritten just below anyway.

8 years agoffmpeg: raise ENOMEM on avfilter_graph_alloc() failure.
Clément Bœsch [Mon, 13 Feb 2012 22:21:50 +0000 (23:21 +0100)]
ffmpeg: raise ENOMEM on avfilter_graph_alloc() failure.

8 years agoUpdate mkv seek tests.
Reimar Döffinger [Mon, 13 Feb 2012 20:29:26 +0000 (21:29 +0100)]
Update mkv seek tests.

Seek beyond the end will now directly return an error instead
of claiming to succeed and then return EOF immediately on next read.
This change is because before 47e015e6f1913f7da943898eb7716a954f947ff7
mkv seek incorrectly never failed.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agomatroskadec: properly fall back to generic seek.
Reimar Döffinger [Sun, 12 Feb 2012 13:09:03 +0000 (14:09 +0100)]
matroskadec: properly fall back to generic seek.

In particular, detect when the index is obviously broken.
This fixes the worst symptoms of trac issue #958 and makes
sense to allow seeking in files without index.
However it is possible that there still is an index parsing bug
with that file.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agomatroskadec: reset num_levels on seek.
Reimar Döffinger [Sun, 12 Feb 2012 13:07:04 +0000 (14:07 +0100)]
matroskadec: reset num_levels on seek.

Otherwise when we run into levels beyond the max. allowed
playback will be permanently broken.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 13 Feb 2012 00:39:11 +0000 (01:39 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: convert yuv2yuvX() to using named arguments.
  swscale: rename "dstw" to "w" to prevent name collisions.
  swscale: use named registers in yuv2yuv1_plane() place.
  lavf: fix aspect ratio mismatch message.
  avconv: set AVFormatContext.duration from '-t'
  cljr: implement encode2.
  cljr: set the properties of the coded_frame, not input frame.
  dnxhdenc: switch to encode2.
  bmpenc: switch to encode2().

Conflicts:
libavcodec/bmpenc.c
libavcodec/cljr.c
libavformat/utils.c
tests/ref/vsynth1/cljr
tests/ref/vsynth2/cljr

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix compilation without HAVE_AVX.
Reimar Döffinger [Sun, 12 Feb 2012 20:37:08 +0000 (21:37 +0100)]
Fix compilation without HAVE_AVX.

%ifdef HAVE_AVX must now be %if HAVE_AVX.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agothreads: Perform the generic progress cleanup more carefully.
Michael Niedermayer [Sat, 11 Feb 2012 19:14:33 +0000 (20:14 +0100)]
threads: Perform the generic progress cleanup more carefully.

The cleanup is only done now when
a picture is returned (assuming that it has to be done when its returned)
a error is returned (assuming that there will be no further progress on the frame)
the codec is not h264 (this is still needed due to some deadlocks in realvideo)

This fixes a decoding regression with 00017.MTS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agothreads: move state update after progress cleanup.
Michael Niedermayer [Sat, 11 Feb 2012 19:13:23 +0000 (20:13 +0100)]
threads: move state update after progress cleanup.

This order is more logic and might prevent a race.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: Mark previous field as done before throwing it away.
Michael Niedermayer [Sat, 11 Feb 2012 19:11:18 +0000 (20:11 +0100)]
h264: Mark previous field as done before throwing it away.

This fixes some deadlock without the generic cleanup code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix aspect ratio mismatch message
Andrey Utkin [Sun, 12 Feb 2012 14:47:31 +0000 (16:47 +0200)]
Fix aspect ratio mismatch message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSimplify: use local variable with same contents directly.
Reimar Döffinger [Sun, 12 Feb 2012 10:50:01 +0000 (11:50 +0100)]
Simplify: use local variable with same contents directly.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoFix Theora-in-ogg keyframe handling.
Reimar Döffinger [Sun, 12 Feb 2012 09:52:42 +0000 (10:52 +0100)]
Fix Theora-in-ogg keyframe handling.

To make seeking work correctly, we must write a new granule for
each keyframe.
Unfortunately we currently have no regression tests due to no
included Theora encoder.
A test based on -vcodec copy from a Theora FATE sample should
probably be added.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoDetect and check for CMOV.
Reimar Döffinger [Sat, 11 Feb 2012 15:04:43 +0000 (16:04 +0100)]
Detect and check for CMOV.

Some MMX-only CPUs do not have support for CMOV.
All SSE/MMX2 CPUs should be fine, thus no check was
added to those functions.
See also https://sourceforge.net/tracker/?func=detail&aid=3358347&group_id=205275&atid=992986

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoswscale: convert yuv2yuvX() to using named arguments.
Ronald S. Bultje [Sun, 12 Feb 2012 01:51:52 +0000 (17:51 -0800)]
swscale: convert yuv2yuvX() to using named arguments.

8 years agoswscale: rename "dstw" to "w" to prevent name collisions.
Ronald S. Bultje [Sun, 12 Feb 2012 02:46:12 +0000 (18:46 -0800)]
swscale: rename "dstw" to "w" to prevent name collisions.

"dstw" can collide with the word-version of the "dst" argument, causing
all kind of weird stuff down the pipe.

8 years agoswscale: use named registers in yuv2yuv1_plane() place.
Ronald S. Bultje [Sun, 12 Feb 2012 01:02:29 +0000 (17:02 -0800)]
swscale: use named registers in yuv2yuv1_plane() place.

Most of the function had been converted before, but I forgot this
particular location.

8 years agolavf: fix aspect ratio mismatch message.
Andrey Utkin [Sun, 12 Feb 2012 14:46:46 +0000 (16:46 +0200)]
lavf: fix aspect ratio mismatch message.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoavconv: set AVFormatContext.duration from '-t'
Andrey Utkin [Sun, 5 Feb 2012 14:49:14 +0000 (16:49 +0200)]
avconv: set AVFormatContext.duration from '-t'

Set output files duration to recording_time option, if given.
Rationale: to save duration into metadata for file that is written to
non-seekable output, for formats like FLV (with metadata at beginning).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agocljr: implement encode2.
Anton Khirnov [Sat, 11 Feb 2012 19:39:12 +0000 (20:39 +0100)]
cljr: implement encode2.

8 years agocljr: set the properties of the coded_frame, not input frame.
Anton Khirnov [Sat, 11 Feb 2012 19:37:41 +0000 (20:37 +0100)]
cljr: set the properties of the coded_frame, not input frame.

8 years agodnxhdenc: switch to encode2.
Anton Khirnov [Sat, 11 Feb 2012 19:03:42 +0000 (20:03 +0100)]
dnxhdenc: switch to encode2.

8 years agobmpenc: switch to encode2().
Anton Khirnov [Sat, 11 Feb 2012 18:44:05 +0000 (19:44 +0100)]
bmpenc: switch to encode2().

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 12 Feb 2012 00:02:55 +0000 (01:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: update reference for seek-alac_mp4
  sunrast: Return AVERROR values instead of -1.
  sunrast: Add support for gray8 decoding.
  swscale: enforce a minimum filtersize.
  alacenc: use AVCodec.encode2()
  alacenc: cosmetics: indentation
  alacenc: consolidate bitstream writing into a single function.
  alacenc: only encode frame size in header for a final smaller frame
  alacenc: store current frame size in AlacEncodeContext.
  alacenc: return AVERROR codes in alac_encode_frame()
  alacenc: calculate a new max frame size for the final small frame
  alacenc: pretty-printing and other cosmetics
  alacenc: fix error handling and potential memleaks in alac_encode_init()
  alacenc: do not set coded_frame->key_frame
  alacenc: do not set bits_per_coded_sample
  alacenc: remove unneeded frame_size check in alac_encode_frame()
  tta: error out if samplerate is zero.
  ttadec: fix invalid free when an error occurs while decoding 24-bit tta
  wavpack: add needed braces for 2 statements inside an if block

Conflicts:
tests/ref/acodec/alac

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoReduce the verbosity of a mpeg1/2 invalid intra-matrix warning.
Carl Eugen Hoyos [Sat, 11 Feb 2012 23:18:32 +0000 (00:18 +0100)]
Reduce the verbosity of a mpeg1/2 invalid intra-matrix warning.

Fixes ticket #973.

8 years agoffmpeg: fix passlogfile with multiple libx264 streams.
Michael Niedermayer [Sat, 11 Feb 2012 03:18:22 +0000 (04:18 +0100)]
ffmpeg: fix passlogfile with multiple libx264 streams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotta: reindent
Paul B Mahol [Sat, 11 Feb 2012 22:57:18 +0000 (22:57 +0000)]
tta: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoModified to generate PAT/PMT for video keyframes
Pavel Koshevoy [Sat, 11 Feb 2012 01:19:08 +0000 (18:19 -0700)]
Modified to generate PAT/PMT for video keyframes

This is so that TS fragments produced by
http://code.google.com/p/httpsegmenter/
would be compatible with JW Player.

A new member variable prev_payload_key was added to MpegTSWriteStream
to help detect transition from non-key to key frame, so that
PAT/PMT would not be produced for every keyframe in intra-only videos.

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolagarith: Fix out of array reads.
Michael Niedermayer [Wed, 8 Feb 2012 21:50:21 +0000 (22:50 +0100)]
lagarith: Fix out of array reads.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: Assume encoding all bits is wanted if bits_per_raw_sample == 0.
Carl Eugen Hoyos [Sat, 11 Feb 2012 22:45:04 +0000 (23:45 +0100)]
ffv1: Assume encoding all bits is wanted if bits_per_raw_sample == 0.

8 years agoCosmetics: Move a block in ffv1's encode_init().
Carl Eugen Hoyos [Sat, 11 Feb 2012 22:42:58 +0000 (23:42 +0100)]
Cosmetics: Move a block in ffv1's encode_init().

Makes the next patch smaller.

8 years agoFATE: update reference for seek-alac_mp4
Justin Ruggles [Sat, 11 Feb 2012 20:58:04 +0000 (15:58 -0500)]
FATE: update reference for seek-alac_mp4

This should have been updated in b590f3a7bf9103ac7a7a61c48568676201d6824b.

8 years agosunrast: Return AVERROR values instead of -1.
Aneesh Dogra [Sat, 11 Feb 2012 20:29:56 +0000 (01:59 +0530)]
sunrast: Return AVERROR values instead of -1.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agosunrast: Add support for gray8 decoding.
Aneesh Dogra [Sat, 11 Feb 2012 05:12:45 +0000 (10:42 +0530)]
sunrast: Add support for gray8 decoding.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoswscale: enforce a minimum filtersize.
Ronald S. Bultje [Sat, 11 Feb 2012 16:42:28 +0000 (08:42 -0800)]
swscale: enforce a minimum filtersize.

At very small dimensions, this calculation could lead to zero-sized
filters, which leads to uninitialized output, zero-sized allocations,
loop overflows in SIMD that uses do{..}while(i++<filtersize); instead
of for(i=0;i<filtersize;i++){..} and several other similar failures.
Therefore, require a minimum filtersize of 1.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agoalacenc: use AVCodec.encode2()
Justin Ruggles [Fri, 3 Feb 2012 23:04:58 +0000 (18:04 -0500)]
alacenc: use AVCodec.encode2()

8 years agoalacenc: cosmetics: indentation
Justin Ruggles [Fri, 3 Feb 2012 22:56:49 +0000 (17:56 -0500)]
alacenc: cosmetics: indentation

8 years agoalacenc: consolidate bitstream writing into a single function.
Justin Ruggles [Fri, 3 Feb 2012 22:53:41 +0000 (17:53 -0500)]
alacenc: consolidate bitstream writing into a single function.

Simplifies use of verbatim mode.

8 years agoalacenc: only encode frame size in header for a final smaller frame
Justin Ruggles [Fri, 3 Feb 2012 22:27:31 +0000 (17:27 -0500)]
alacenc: only encode frame size in header for a final smaller frame

Otherwise it is not needed because it matches the frame size as encoded in
the extradata.

8 years agoalacenc: store current frame size in AlacEncodeContext.
Justin Ruggles [Thu, 2 Feb 2012 23:06:28 +0000 (18:06 -0500)]
alacenc: store current frame size in AlacEncodeContext.

This avoids an indirection and will simplify implementation of encode2()

8 years agoalacenc: return AVERROR codes in alac_encode_frame()
Justin Ruggles [Thu, 2 Feb 2012 21:11:17 +0000 (16:11 -0500)]
alacenc: return AVERROR codes in alac_encode_frame()

8 years agoalacenc: calculate a new max frame size for the final small frame
Justin Ruggles [Thu, 2 Feb 2012 21:03:41 +0000 (16:03 -0500)]
alacenc: calculate a new max frame size for the final small frame

Gives a better estimate of buffer requirements and a better decision of
whether or not to use verbatim mode.

8 years agoalacenc: pretty-printing and other cosmetics
Justin Ruggles [Thu, 2 Feb 2012 02:21:24 +0000 (21:21 -0500)]
alacenc: pretty-printing and other cosmetics

8 years agoalacenc: fix error handling and potential memleaks in alac_encode_init()
Justin Ruggles [Thu, 2 Feb 2012 01:54:34 +0000 (20:54 -0500)]
alacenc: fix error handling and potential memleaks in alac_encode_init()

8 years agoalacenc: do not set coded_frame->key_frame
Justin Ruggles [Thu, 2 Feb 2012 01:43:43 +0000 (20:43 -0500)]
alacenc: do not set coded_frame->key_frame

It is already set in avcodec_alloc_frame()

8 years agoalacenc: do not set bits_per_coded_sample
Justin Ruggles [Thu, 2 Feb 2012 01:41:40 +0000 (20:41 -0500)]
alacenc: do not set bits_per_coded_sample

encoded ALAC does not have a fixed number of bits per sample

8 years agoalacenc: remove unneeded frame_size check in alac_encode_frame()
Justin Ruggles [Thu, 2 Feb 2012 01:38:06 +0000 (20:38 -0500)]
alacenc: remove unneeded frame_size check in alac_encode_frame()

8 years agotta: error out if samplerate is zero.
Ronald S. Bultje [Fri, 10 Feb 2012 18:51:43 +0000 (10:51 -0800)]
tta: error out if samplerate is zero.

Prevents a division by zero later on.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agoansi: Fix use of uninitalized width/height warning.
Michael Niedermayer [Mon, 6 Feb 2012 01:23:02 +0000 (02:23 +0100)]
ansi: Fix use of uninitalized width/height warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agottadec: fix invalid free when an error occurs while decoding 24-bit tta
Justin Ruggles [Thu, 9 Feb 2012 19:49:59 +0000 (14:49 -0500)]
ttadec: fix invalid free when an error occurs while decoding 24-bit tta

8 years agowavpack: add needed braces for 2 statements inside an if block
Justin Ruggles [Sat, 11 Feb 2012 01:18:10 +0000 (20:18 -0500)]
wavpack: add needed braces for 2 statements inside an if block

8 years agotta: Add some safety precautions to avoid freeing things that have not been allocated.
Michael Niedermayer [Sat, 11 Feb 2012 01:06:24 +0000 (02:06 +0100)]
tta: Add some safety precautions to avoid freeing things that have not been allocated.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotta: do not leak memory if bps == 3
Paul B Mahol [Fri, 10 Feb 2012 22:41:48 +0000 (22:41 +0000)]
tta: do not leak memory if bps == 3

In bps == 3 case output is decoded directly.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuildsys: Fix shared lib build of MPlayer.
Ingo Brückl [Fri, 10 Feb 2012 21:26:23 +0000 (22:26 +0100)]
buildsys: Fix shared lib build of MPlayer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 11 Feb 2012 00:22:22 +0000 (01:22 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (38 commits)
  v210enc: remove redundant check for pix_fmt
  wavpack: allow user to disable CRC checking
  v210enc: Use Bytestream2 functions
  cafdec: Check return value of avio_seek and avoid modifying state if it fails
  yop: Check return value of avio_seek and avoid modifying state if it fails
  tta: Check return value of avio_seek and avoid modifying state if it fails
  tmv: Check return value of avio_seek and avoid modifying state if it fails
  r3d: Check return value of avio_seek and avoid modifying state if it fails
  nsvdec: Check return value of avio_seek and avoid modifying state if it fails
  mpc8: Check return value of avio_seek and avoid modifying state if it fails
  jvdec: Check return value of avio_seek and avoid modifying state if it fails
  filmstripdec: Check return value of avio_seek and avoid modifying state if it fails
  ffmdec: Check return value of avio_seek and avoid modifying state if it fails
  dv: Check return value of avio_seek and avoid modifying state if it fails
  bink: Check return value of avio_seek and avoid modifying state if it fails
  Check AVCodec.pix_fmts in avcodec_open2()
  svq3: Prevent illegal reads while parsing extradata.
  remove ParseContext1
  vc1: use ff_parse_close
  mpegvideo parser: move specific fields into private context
  ...

Conflicts:
libavcodec/4xm.c
libavcodec/aacdec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/mpeg4video_parser.c
libavcodec/svq3.c
libavcodec/v210enc.c
libavformat/cafdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoPartially revert "Fix png decoding on x86."
Reimar Döffinger [Fri, 10 Feb 2012 20:24:27 +0000 (21:24 +0100)]
Partially revert "Fix png decoding on x86."

This partially reverts commit 58dabf7bf2fdd08f79173da0df613127ff783028.
It is no longer necessary to use unaligned mov.
The swapped mov argument fix remains though.

8 years agoFix bitexact intra mismatch control.
Reimar Döffinger [Fri, 10 Feb 2012 19:09:05 +0000 (20:09 +0100)]
Fix bitexact intra mismatch control.

The DC coefficient should be included, too.
This probably was missed because DC quantizer is always
even for MPEG-1/2 but this function is also used for MPEG-4.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agompegvideodec: minor simplifications.
Reimar Döffinger [Fri, 10 Feb 2012 18:53:41 +0000 (19:53 +0100)]
mpegvideodec: minor simplifications.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agomsmpeg4: replace 999999 by INT_MAX and initial by a valid index.
Michael Niedermayer [Fri, 10 Feb 2012 21:32:15 +0000 (22:32 +0100)]
msmpeg4: replace 999999 by INT_MAX and initial by a valid index.

Fixes Ticket990

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agov210enc: remove redundant check for pix_fmt
Paul B Mahol [Sun, 5 Feb 2012 21:14:33 +0000 (21:14 +0000)]
v210enc: remove redundant check for pix_fmt

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agowavpack: allow user to disable CRC checking
Paul B Mahol [Fri, 10 Feb 2012 18:51:57 +0000 (18:51 +0000)]
wavpack: allow user to disable CRC checking

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agov210enc: Use Bytestream2 functions
Aneesh Dogra [Wed, 8 Feb 2012 17:48:40 +0000 (23:18 +0530)]
v210enc: Use Bytestream2 functions

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agocafdec: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 10 Feb 2012 18:47:53 +0000 (18:47 +0000)]
cafdec: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoyop: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:45 +0000 (19:13 +0000)]
yop: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agotta: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:44 +0000 (19:13 +0000)]
tta: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agotmv: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:43 +0000 (19:13 +0000)]
tmv: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agor3d: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:42 +0000 (19:13 +0000)]
r3d: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agonsvdec: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:41 +0000 (19:13 +0000)]
nsvdec: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agompc8: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:40 +0000 (19:13 +0000)]
mpc8: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agojvdec: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:39 +0000 (19:13 +0000)]
jvdec: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agofilmstripdec: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:38 +0000 (19:13 +0000)]
filmstripdec: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoffmdec: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:37 +0000 (19:13 +0000)]
ffmdec: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agodv: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:36 +0000 (19:13 +0000)]
dv: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agobink: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate [Fri, 3 Feb 2012 19:13:34 +0000 (19:13 +0000)]
bink: Check return value of avio_seek and avoid modifying state if it fails

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoffmpeg: prefer NULL over 0 for av_log context pointer parameter.
Clément Bœsch [Fri, 10 Feb 2012 19:47:42 +0000 (20:47 +0100)]
ffmpeg: prefer NULL over 0 for av_log context pointer parameter.

8 years agoffmpeg: move quality parameter to do_video_out() scope.
Clément Bœsch [Wed, 8 Feb 2012 16:55:04 +0000 (17:55 +0100)]
ffmpeg: move quality parameter to do_video_out() scope.

This make do_video_out() and do_audio_out() consistent. Also simplifies
callers.

8 years agoffmpeg: make use of ret error out in transcode_video().
Clément Bœsch [Wed, 8 Feb 2012 16:28:02 +0000 (17:28 +0100)]
ffmpeg: make use of ret error out in transcode_video().

8 years agoffmpeg: move filtered_frame to the CONFIG_AVFILTER scope.
Clément Bœsch [Tue, 7 Feb 2012 12:26:53 +0000 (13:26 +0100)]
ffmpeg: move filtered_frame to the CONFIG_AVFILTER scope.

This simplifies a bit the #ifdefery.

8 years agoffmpeg: move do_video_stats() above do_video_out().
Clément Bœsch [Wed, 8 Feb 2012 16:09:04 +0000 (17:09 +0100)]
ffmpeg: move do_video_stats() above do_video_out().

This avoid a forward declaration.

8 years agoffmpeg: move video stats code to do_video_out().
Clément Bœsch [Tue, 7 Feb 2012 12:22:20 +0000 (13:22 +0100)]
ffmpeg: move video stats code to do_video_out().

This will allow some simplifications in transcode_video().

8 years agoffmpeg: move filtered_frame to video stream processing scope.
Clément Bœsch [Tue, 7 Feb 2012 10:49:53 +0000 (11:49 +0100)]
ffmpeg: move filtered_frame to video stream processing scope.

8 years agoffmpeg: reindent after video frame polling simplification.
Clément Bœsch [Tue, 7 Feb 2012 10:51:06 +0000 (11:51 +0100)]
ffmpeg: reindent after video frame polling simplification.

8 years agoffmpeg: simplify video frame polling.
Clément Bœsch [Tue, 7 Feb 2012 10:42:59 +0000 (11:42 +0100)]
ffmpeg: simplify video frame polling.

input_video_filter and output_video_filter can't be NULL at this point.
If they are, the current code would likely crash anyway (since
filtered_frame would be NULL and sent to do_video_out().

8 years agoffmpeg: use exit_program() if configure_video_filters() fails.
Clément Bœsch [Tue, 7 Feb 2012 10:38:03 +0000 (11:38 +0100)]
ffmpeg: use exit_program() if configure_video_filters() fails.

8 years agoCheck AVCodec.pix_fmts in avcodec_open2()
Paul B Mahol [Fri, 10 Feb 2012 00:05:14 +0000 (00:05 +0000)]
Check AVCodec.pix_fmts in avcodec_open2()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agosvq3: Prevent illegal reads while parsing extradata.
Alex Converse [Fri, 10 Feb 2012 04:21:47 +0000 (20:21 -0800)]
svq3: Prevent illegal reads while parsing extradata.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
8 years agoAdd missing newline to mpeg1/2 intra matrix error message.
Carl Eugen Hoyos [Fri, 10 Feb 2012 16:50:50 +0000 (17:50 +0100)]
Add missing newline to mpeg1/2 intra matrix error message.

8 years agoAdd missing swscale dependency for MP-filters.
Carl Eugen Hoyos [Fri, 10 Feb 2012 16:39:36 +0000 (17:39 +0100)]
Add missing swscale dependency for MP-filters.

Reported-by: Hanspeter Niederstrasser
Fixes ticket #989.

8 years agoAdd missing swresample dependency for ffplay.
Hanspeter Niederstrasser [Fri, 10 Feb 2012 16:33:39 +0000 (17:33 +0100)]
Add missing swresample dependency for ffplay.

Fixes part of ticket #989.

8 years agoremove ParseContext1
Rafaël Carré [Thu, 9 Feb 2012 00:34:37 +0000 (19:34 -0500)]
remove ParseContext1

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agovc1: use ff_parse_close
Rafaël Carré [Wed, 8 Feb 2012 22:46:51 +0000 (17:46 -0500)]
vc1: use ff_parse_close

It works as long as ParseContext is the first member of the private struct

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agompegvideo parser: move specific fields into private context
Rafaël Carré [Wed, 8 Feb 2012 22:46:50 +0000 (17:46 -0500)]
mpegvideo parser: move specific fields into private context

This obviates using ParseContext1, which is slated for removal.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agompeg4video parser: move specific fields into private context
Rafaël Carré [Fri, 10 Feb 2012 01:26:17 +0000 (20:26 -0500)]
mpeg4video parser: move specific fields into private context

This obviates using ParseContext1, which is slated for removal.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agocavs parser: fix parser context type
Rafaël Carré [Wed, 8 Feb 2012 22:46:48 +0000 (17:46 -0500)]
cavs parser: fix parser context type

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years ago4xm, timefilter: K&R formatting cosmetics
Yordan Makariev [Wed, 11 Jan 2012 19:27:20 +0000 (21:27 +0200)]
4xm, timefilter: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agortpenc: Write a log message if the max packet size is too small
Martin Storsjö [Thu, 9 Feb 2012 21:28:01 +0000 (23:28 +0200)]
rtpenc: Write a log message if the max packet size is too small

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoh264: disallow constrained intra prediction modes for luma.
Ronald S. Bultje [Fri, 10 Feb 2012 06:57:01 +0000 (22:57 -0800)]
h264: disallow constrained intra prediction modes for luma.

Conversion of the luma intra prediction mode to one of the constrained
("alzheimer") ones can happen by crafting special bitstreams, causing
a crash because we'll call a NULL function pointer for 16x16 block intra
prediction, since constrained intra prediction functions are only
implemented for chroma (8x8 blocks).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agosunrast: Remove the useless check.
Aneesh Dogra [Fri, 10 Feb 2012 06:08:07 +0000 (11:38 +0530)]
sunrast: Remove the useless check.

in , else (1) { if (!1) } the if conditional will never evaluate to be true.
So as making the check useless.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: Add threshold to discard crazy/damaged timestamps.
Michael Niedermayer [Tue, 7 Feb 2012 22:43:10 +0000 (23:43 +0100)]
ffmpeg: Add threshold to discard crazy/damaged timestamps.

The added tests are limited to the case where timestamp discontinuities
are not allowed. The default is 30 hours which is arbitrarily picked and
quite conservative.
This prevents a out of memory condition due to duplicating a frame
millions of times.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>