ffmpeg.git
7 years agoUnconditionally compile init_stream() in bintext.
Carl Eugen Hoyos [Sun, 3 Jun 2012 12:47:26 +0000 (14:47 +0200)]
Unconditionally compile init_stream() in bintext.

Fixes compilation of xbin, adf and idf demuxer if
bintext demuxer was disabled.

Fixes ticket #1399

7 years agoaf_amerge: use the buferqueue API.
Nicolas George [Thu, 31 May 2012 19:47:10 +0000 (21:47 +0200)]
af_amerge: use the buferqueue API.

7 years agoaf_astreamsync: set samples rate in query_formats.
Nicolas George [Thu, 31 May 2012 19:15:00 +0000 (21:15 +0200)]
af_astreamsync: set samples rate in query_formats.

7 years agompegtsenc: zero pointers after freeing
Michael Niedermayer [Sun, 3 Jun 2012 01:44:16 +0000 (03:44 +0200)]
mpegtsenc: zero pointers after freeing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts_audio_write: fix potential integer overflow
Michael Niedermayer [Sun, 3 Jun 2012 01:42:50 +0000 (03:42 +0200)]
mpegts_audio_write: fix potential integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 3 Jun 2012 00:56:52 +0000 (02:56 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegtsenc: Support LATM packetization for AAC
  adtsenc: Don't expose the muxer internals to the rest of lavf
  mpegtsenc: use AVFormatContext for AAC packetization
  mpegtsenc: use AVERROR() for return codes

Conflicts:
libavformat/adts.h
libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: add --enable/disable-random option
Mans Rullgard [Wed, 9 May 2012 03:29:53 +0000 (04:29 +0100)]
configure: add --enable/disable-random option

This allows creating random configurations which is useful for
testing purposes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Conflicts:

configure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacsbr: remove unused variables
Mans Rullgard [Mon, 23 Jan 2012 21:04:51 +0000 (21:04 +0000)]
aacsbr: remove unused variables

7 years agoaacsbr: optimize sine level addition
Michael Niedermayer [Sat, 2 Jun 2012 23:46:05 +0000 (01:46 +0200)]
aacsbr: optimize sine level addition

Based-on commit by Måns Rullgård <mans@mansr.com>

original:   1424 decicycles in phi, 1024 runs, 0 skips
mans code:  1104 decicycles in phi, 1024 runs, 0 skips
this change: 734 decicycles in phi, 1024 runs, 0 skips

mans code:   1 file changed, 20 insertions(+), 10 deletions(-)
this change: 1 file changed, 10 insertions(+), 6 deletions(-)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegtsenc: Support LATM packetization for AAC
Jindrich Makovicka [Fri, 1 Jun 2012 08:42:48 +0000 (10:42 +0200)]
mpegtsenc: Support LATM packetization for AAC

This adds the avoption mpegts_flags and converts the existing
resend_headers option into a flag, keeping the old option as
fallback for now.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoadtsenc: Don't expose the muxer internals to the rest of lavf
Jindrich Makovicka [Tue, 29 May 2012 12:48:38 +0000 (14:48 +0200)]
adtsenc: Don't expose the muxer internals to the rest of lavf

This isn't required any longer, when the mpegts muxer uses it
as a proper chained muxer.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agompegtsenc: use AVFormatContext for AAC packetization
Jindrich Makovicka [Fri, 1 Jun 2012 10:42:20 +0000 (12:42 +0200)]
mpegtsenc: use AVFormatContext for AAC packetization

This removes the dependency on adts.c internals, and simplifies
adding other packetization formats.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agompegtsenc: use AVERROR() for return codes
Jindrich Makovicka [Fri, 1 Jun 2012 09:44:56 +0000 (11:44 +0200)]
mpegtsenc: use AVERROR() for return codes

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agompc7: fix handling of last frame
Michael Niedermayer [Sat, 2 Jun 2012 21:43:31 +0000 (23:43 +0200)]
mpc7: fix handling of last frame

Fixes heap buffer overflow
Fixes ticket1393

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: fix regression that caused reading the whole file during open
Michael Niedermayer [Sat, 2 Jun 2012 20:50:40 +0000 (22:50 +0200)]
oggdec: fix regression that caused reading the whole file during open

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopng_parser: dont falsely mark frames as keyframes
Michael Niedermayer [Sat, 2 Jun 2012 19:12:20 +0000 (21:12 +0200)]
png_parser: dont falsely mark frames as keyframes

Fixes Ticket1381

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: use input keyframe flag when muxer does not provide keyframe flags.
Michael Niedermayer [Sat, 2 Jun 2012 19:11:43 +0000 (21:11 +0200)]
lavf: use input keyframe flag when muxer does not provide keyframe flags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobink: fix out of reference frame read
Michael Niedermayer [Sat, 2 Jun 2012 17:56:10 +0000 (19:56 +0200)]
bink: fix out of reference frame read

Fixes Ticket1374

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 2 Jun 2012 15:06:02 +0000 (17:06 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: remove VideoPicture pix_fmt and use frame pixel format instead
  ffplay: only request 4 or 6 channels from SDL, if SDL version is at least 1.2.8
  ffplay: add pause audio feature in the middle of a packet
  ffplay: remove VideoPicture duration field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: log debug output for slightly truncated streams
Michael Niedermayer [Sat, 2 Jun 2012 13:37:20 +0000 (15:37 +0200)]
h264: log debug output for slightly truncated streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: try to better handle h264 streams that are slightly truncated
Michael Niedermayer [Sat, 2 Jun 2012 11:58:28 +0000 (13:58 +0200)]
h264: try to better handle h264 streams that are slightly truncated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobmv: fix apparent sign error in the frame_off check
Michael Niedermayer [Sat, 2 Jun 2012 02:06:16 +0000 (04:06 +0200)]
bmv: fix apparent sign error in the frame_off check

Fixes part of Ticket1373

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobmv: fix integer overflows in vlc decoder.
Michael Niedermayer [Sat, 2 Jun 2012 02:04:29 +0000 (04:04 +0200)]
bmv: fix integer overflows in vlc decoder.

Fixes part of Ticket1373

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Based-on-patch-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: fix integer overflow in quant table initialization
Michael Niedermayer [Sat, 2 Jun 2012 00:37:36 +0000 (02:37 +0200)]
ffv1: fix integer overflow in quant table initialization

Fixes part of Ticket1372

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: fix crash caused by version becoming inconsistent
Michael Niedermayer [Sat, 2 Jun 2012 00:21:30 +0000 (02:21 +0200)]
ffv1: fix crash caused by version becoming inconsistent

Fixes part of Ticket1372

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofraps: fix version 0/1 input data size check.
Michael Niedermayer [Fri, 1 Jun 2012 21:21:03 +0000 (23:21 +0200)]
fraps: fix version 0/1 input data size check.

Fixes array overread.
Fixes Ticket1371

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowmv1: check that the input buffer is large enough
Michael Niedermayer [Fri, 1 Jun 2012 19:42:29 +0000 (21:42 +0200)]
wmv1: check that the input buffer is large enough

Fixes null ptr deref
Fixes Ticket1367

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffprobe: add flat output format.
Clément Bœsch [Tue, 29 May 2012 21:22:39 +0000 (23:22 +0200)]
ffprobe: add flat output format.

7 years agoffprobe/xml: use writer multiple_sections instead of local context variable.
Clément Bœsch [Tue, 29 May 2012 21:21:43 +0000 (23:21 +0200)]
ffprobe/xml: use writer multiple_sections instead of local context variable.

7 years agoffprobe: move packets_and_frames work to writer context.
Clément Bœsch [Tue, 29 May 2012 21:21:06 +0000 (23:21 +0200)]
ffprobe: move packets_and_frames work to writer context.

7 years agoLet ffmpeg select the null and anull filters.
Carl Eugen Hoyos [Fri, 1 Jun 2012 11:53:38 +0000 (13:53 +0200)]
Let ffmpeg select the null and anull filters.

They are needed since 16e25ef.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 1 Jun 2012 17:52:35 +0000 (19:52 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  http: Add the url_shutdown function for https, too
  http: Simplify code by removing a local variable
  http: Clear the old URLContext pointer when closed
  tcp: Try enabling SO_REUSEADDR when listening
  tcp: Check the return values from bind and accept
  avisynth: Make sure the filename passed to avisynth is in the right code page

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodct-test: give emms a memory clober.
Michael Niedermayer [Fri, 1 Jun 2012 17:16:14 +0000 (19:16 +0200)]
dct-test: give emms a memory clober.

Without this, the compiler in theory could attempt to keep
things in float registers across the emms which would cause
bad things to happen.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodct-test: perform emms before gettime().
Michael Niedermayer [Fri, 1 Jun 2012 17:15:24 +0000 (19:15 +0200)]
dct-test: perform emms before gettime().

This fixes the hypothetical case of a gettime implementation using floats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: enable fate-mapchan-6ch-extract-2-downmix-mono
Michael Niedermayer [Fri, 1 Jun 2012 16:44:07 +0000 (18:44 +0200)]
fate: enable fate-mapchan-6ch-extract-2-downmix-mono

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: move pan filter insertion up.
Michael Niedermayer [Fri, 1 Jun 2012 16:42:12 +0000 (18:42 +0200)]
ffmpeg: move pan filter insertion up.

This fixes one (disabled) fate test.

Thanks-to: ubitux to pointing at the odd filter order and stereo/mono messup
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohttp: Add the url_shutdown function for https, too
Martin Storsjö [Fri, 1 Jun 2012 13:36:20 +0000 (16:36 +0300)]
http: Add the url_shutdown function for https, too

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Simplify code by removing a local variable
Martin Storsjö [Fri, 1 Jun 2012 13:30:01 +0000 (16:30 +0300)]
http: Simplify code by removing a local variable

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Clear the old URLContext pointer when closed
Martin Storsjö [Fri, 1 Jun 2012 13:24:47 +0000 (16:24 +0300)]
http: Clear the old URLContext pointer when closed

This fixes issues with opening http urls that have authentication
or redirects, introduced in commit e999b641.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agorv20: fix lowres out of array read
Michael Niedermayer [Fri, 1 Jun 2012 15:07:07 +0000 (17:07 +0200)]
rv20: fix lowres out of array read

Fixes Ticket1239

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyopdec: check frame oddness to be within supported limits
Michael Niedermayer [Fri, 1 Jun 2012 13:52:20 +0000 (15:52 +0200)]
yopdec: check frame oddness to be within supported limits

Fixes Ticket1365

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyopdec: check that palette fits in the packet
Michael Niedermayer [Fri, 1 Jun 2012 13:51:50 +0000 (15:51 +0200)]
yopdec: check that palette fits in the packet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohttp: use ffurl_closep()
Michael Niedermayer [Fri, 1 Jun 2012 12:48:17 +0000 (14:48 +0200)]
http: use ffurl_closep()

Fixes Ticket1383

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agourl: add ffurl_closep() which also sets the context pointer to NULL
Michael Niedermayer [Fri, 1 Jun 2012 12:47:30 +0000 (14:47 +0200)]
url: add ffurl_closep() which also sets the context pointer to NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: use av_freep() in ffurl_close()
Michael Niedermayer [Fri, 1 Jun 2012 12:40:05 +0000 (14:40 +0200)]
lavf: use av_freep() in ffurl_close()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotcp: Check the return values from bind and accept
Martin Storsjö [Wed, 30 May 2012 14:35:05 +0000 (17:35 +0300)]
tcp: Check the return values from bind and accept

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolog: add category to AVClass
Michael Niedermayer [Mon, 28 May 2012 10:49:23 +0000 (12:49 +0200)]
log: add category to AVClass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix memleak
Michael Niedermayer [Fri, 1 Jun 2012 10:31:13 +0000 (12:31 +0200)]
ffmpeg: fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodnxhd: replace asserts by av_asserts
Michael Niedermayer [Fri, 1 Jun 2012 10:14:03 +0000 (12:14 +0200)]
dnxhd: replace asserts by av_asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: only check stddev for acodec-ra144
Michael Niedermayer [Thu, 31 May 2012 01:08:56 +0000 (03:08 +0200)]
fate: only check stddev for acodec-ra144

ra144 uses floats so bitexactness cannot be guranteed
This should fix a long standing issue with icc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoLet ffmpeg select the setpts filter.
Carl Eugen Hoyos [Fri, 1 Jun 2012 07:45:25 +0000 (09:45 +0200)]
Let ffmpeg select the setpts filter.

Do not disable ffmpeg with --disable-everything.

7 years agoswr: fix a few typo.
Clément Bœsch [Fri, 1 Jun 2012 06:06:36 +0000 (08:06 +0200)]
swr: fix a few typo.

7 years agofate: try to fix 3rd md5 implementation
Michael Niedermayer [Fri, 1 Jun 2012 01:52:22 +0000 (03:52 +0200)]
fate: try to fix 3rd md5 implementation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago8svx: fix crash
Michael Niedermayer [Thu, 31 May 2012 23:33:00 +0000 (01:33 +0200)]
8svx: fix crash

Fixes Ticket1377

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosgienc: add a limit for maximum supported resolution
Piotr Bandurski [Thu, 31 May 2012 18:10:04 +0000 (20:10 +0200)]
sgienc: add a limit for maximum supported resolution

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotcp: Try enabling SO_REUSEADDR when listening
Martin Storsjö [Wed, 30 May 2012 14:37:51 +0000 (17:37 +0300)]
tcp: Try enabling SO_REUSEADDR when listening

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotcp: Check the return values from bind and accept
Martin Storsjö [Wed, 30 May 2012 14:35:05 +0000 (17:35 +0300)]
tcp: Check the return values from bind and accept

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoqdm2: fix incorrect error spam
Michael Niedermayer [Thu, 31 May 2012 22:35:06 +0000 (00:35 +0200)]
qdm2: fix incorrect error spam

Fixes Ticket1375

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmp3lame: add missing layout terminator
Michael Niedermayer [Thu, 31 May 2012 22:07:36 +0000 (00:07 +0200)]
libmp3lame: add missing layout terminator

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Fail on DPC its not fully implemented
Michael Niedermayer [Thu, 31 May 2012 21:52:08 +0000 (23:52 +0200)]
h264: Fail on DPC its not fully implemented

Fixes part of Ticket1369

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodv-demux: dont mess with codec values
Michael Niedermayer [Thu, 31 May 2012 21:50:08 +0000 (23:50 +0200)]
dv-demux: dont mess with codec values

Fixes part of Ticket1369

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojacosub_probe: slightly increase the score to limit misdetection.
Clément Bœsch [Thu, 31 May 2012 20:12:46 +0000 (22:12 +0200)]
jacosub_probe: slightly increase the score to limit misdetection.

7 years agojacosub_probe: speedup by making only one call to sscanf
Clément Bœsch [Thu, 31 May 2012 19:12:25 +0000 (21:12 +0200)]
jacosub_probe: speedup by making only one call to sscanf

7 years agoavisynth: Make sure the filename passed to avisynth is in the right code page
Oka Motofumi [Wed, 30 May 2012 17:14:43 +0000 (02:14 +0900)]
avisynth: Make sure the filename passed to avisynth is in the right code page

avisynth is a non-unicode application and cannot accept UTF-8
characters. Therefore, the input filename should be converted to
the correct code page that it expects.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 31 May 2012 19:27:42 +0000 (21:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines
  http: Pass the proper return code of net IO operations
  http: Add 'post_data', a new option which sets custom HTTP post data
  lavfi: amix: check active input count before calling request_samples
  vp8: move block coeff arithcoder on stack.
  mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3.

Conflicts:
libavformat/ac3dec.c
libavformat/mp3dec.c
tests/fate/ac3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: move q0 scan tables into context
Michael Niedermayer [Thu, 31 May 2012 18:19:56 +0000 (20:19 +0200)]
h264: move q0 scan tables into context

This fixes out of global array reads.
The alternative solutions of checking the index or modifying the VLC tables
to prevent the index going outside are each about 1-2 cpu cyclces slower
per coded 4x4 block.
The alternative of padding the global tables directly is more ugly and
moving them to the context should benefit cache locality.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggparsevorbis: fix null ptr dereference
Michael Niedermayer [Thu, 31 May 2012 17:06:14 +0000 (19:06 +0200)]
oggparsevorbis: fix null ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4videodec: Check that cplx_estimation_* fits in the available space
Michael Niedermayer [Thu, 31 May 2012 16:54:00 +0000 (18:54 +0200)]
mpeg4videodec: Check that cplx_estimation_* fits in the available space

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_overlay: rewrite request/push logic.
Nicolas George [Tue, 24 Apr 2012 13:45:08 +0000 (15:45 +0200)]
vf_overlay: rewrite request/push logic.

The old implementation, upon receiving a frame on the main
input, would request an overlay frame if necessary. This could
generate an infinite recursion, off-by-one frame mismatch and
other harmful effects, especially it the split filter is present
upgraph.

The new implementation uses the linear approach: it uses two
buffer queues for frames received out of turn and forwards
request_frame calls to the input where a frame is necessary.

7 years agolavfi: add a generic API for buffer queues.
Nicolas George [Tue, 24 Apr 2012 22:31:22 +0000 (00:31 +0200)]
lavfi: add a generic API for buffer queues.

7 years agosink_buffer: guard against NULL frames.
Nicolas George [Tue, 24 Apr 2012 10:51:37 +0000 (12:51 +0200)]
sink_buffer: guard against NULL frames.

This only happens if some filter somewhere is bogus,
but it helps debugging.

7 years agogifenc: support resolutions up to 65535x65535
Piotr Bandurski [Thu, 31 May 2012 13:17:59 +0000 (15:17 +0200)]
gifenc: support resolutions up to 65535x65535

Maybe someone can add a check in the second gif encoder (rgb24), because I'm not sure where it should be added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegenc: add a limit for maximum supported resolution
Piotr Bandurski [Thu, 31 May 2012 11:49:00 +0000 (13:49 +0200)]
mjpegenc: add a limit for maximum supported resolution

jpeg does not allow more than 65000 pixels for width and height

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfenc: support 50 and 60 frame rates
Matthieu Bouron [Sat, 26 May 2012 16:09:07 +0000 (18:09 +0200)]
mxfenc: support 50 and 60 frame rates

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoipmovie_probe: speedup by avoiding memcmp() call
Michael Niedermayer [Thu, 31 May 2012 14:19:26 +0000 (16:19 +0200)]
ipmovie_probe: speedup by avoiding memcmp() call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoac3_probe: speedup by checking for header earlier
Michael Niedermayer [Thu, 31 May 2012 14:14:27 +0000 (16:14 +0200)]
ac3_probe: speedup by checking for header earlier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoprobetest: allow specifying parameters on the command line
Michael Niedermayer [Thu, 31 May 2012 13:53:58 +0000 (15:53 +0200)]
probetest: allow specifying parameters on the command line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyop_probe: check more fields to avoid detecting random data as yop
Michael Niedermayer [Thu, 31 May 2012 12:47:15 +0000 (14:47 +0200)]
yop_probe: check more fields to avoid detecting random data as yop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: allow overriding input top field first
Michael Niedermayer [Thu, 31 May 2012 10:29:07 +0000 (12:29 +0200)]
ffmpeg: allow overriding input top field first

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobinkaudio: check number of channels
Paul B Mahol [Thu, 31 May 2012 08:58:31 +0000 (08:58 +0000)]
binkaudio: check number of channels

Fixes #1380.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoindeo5: check quant_mat
Michael Niedermayer [Thu, 31 May 2012 03:01:28 +0000 (05:01 +0200)]
indeo5: check quant_mat

prevents out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: dont freopen() stdout
Michael Niedermayer [Thu, 31 May 2012 00:56:56 +0000 (02:56 +0200)]
fate: dont freopen() stdout

it doesnt work and breaks most BSDs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorange coder test code: decoding errors are av_log_error not debug.
Michael Niedermayer [Wed, 30 May 2012 22:48:29 +0000 (00:48 +0200)]
range coder test code: decoding errors are av_log_error not debug.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: fix reading global header with CRC
Michael Niedermayer [Wed, 30 May 2012 22:47:36 +0000 (00:47 +0200)]
ffv1: fix reading global header with CRC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavidec: fix odd extradata size case.
Michael Niedermayer [Wed, 30 May 2012 22:46:47 +0000 (00:46 +0200)]
avidec: fix odd extradata size case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavformat: ff_get_bmp_header: return esize too
Michael Niedermayer [Wed, 30 May 2012 22:46:02 +0000 (00:46 +0200)]
libavformat: ff_get_bmp_header: return esize too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines
Michael Niedermayer [Wed, 30 May 2012 10:54:22 +0000 (12:54 +0200)]
fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines

The default mmxext and sse implementations of apply_window_int16
aren't bitexact.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Pass the proper return code of net IO operations
Samuel Pitoiset [Wed, 30 May 2012 09:52:11 +0000 (11:52 +0200)]
http: Pass the proper return code of net IO operations

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Add 'post_data', a new option which sets custom HTTP post data
Samuel Pitoiset [Wed, 30 May 2012 09:27:18 +0000 (11:27 +0200)]
http: Add 'post_data', a new option which sets custom HTTP post data

This allows doing http posts with a content-length header sent
in advance, avoiding chunked encoding.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavfi: amix: check active input count before calling request_samples
Justin Ruggles [Wed, 30 May 2012 12:48:26 +0000 (08:48 -0400)]
lavfi: amix: check active input count before calling request_samples

fixes use of the amix filter with only 1 input

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 30 May 2012 17:32:06 +0000 (19:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm-mpeg: improve log message wording
  fate: add missing $(TARGET_PATH) to ac3-fixed-encode
  fate: fix md5sum replacement on some systems
  avprobe: correctly set the default formatter
  lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs
  lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs
  lavr: add C functions for mixing 2 to 1 channels with s16p format
  avprobe: move formatter functions in the context

Conflicts:
ffprobe.c
libavcodec/pcm-mpeg.c
tests/fate/ac3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovp8: move block coeff arithcoder on stack.
Ronald S. Bultje [Tue, 29 May 2012 17:56:15 +0000 (10:56 -0700)]
vp8: move block coeff arithcoder on stack.

This prevents gcc from assuming that contents of it may have changed
between calls to vp56_range_get_prob(), thus preventing countless (and
unnecessary) movs. Decoding of sintel trailer goes from (avg+SG) 9.796
+/- 0.003 to 9.635 +/- 0.010.

7 years agomp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3.
Ronald S. Bultje [Wed, 2 May 2012 22:45:18 +0000 (15:45 -0700)]
mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3.

7 years agopcm-mpeg: improve log message wording
Christian Schmidt [Wed, 30 May 2012 11:40:23 +0000 (11:40 +0000)]
pcm-mpeg: improve log message wording

We support every defined value for channel layout, bitrate and sample depth.
All other values are not unsupported, but reserved.
Update comments to say "are used" instead of "are known or exist".

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoh264_cavlc: check prefix before using it.
Michael Niedermayer [Wed, 30 May 2012 14:42:01 +0000 (16:42 +0200)]
h264_cavlc: check prefix before using it.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: increase scantable sizes to avoid overread
Michael Niedermayer [Wed, 30 May 2012 14:40:33 +0000 (16:40 +0200)]
h264: increase scantable sizes to avoid overread

We could also check the index but this would slow speed critical code
down.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotruemotion1: Check index, fix out of array read
Michael Niedermayer [Wed, 30 May 2012 14:19:36 +0000 (16:19 +0200)]
truemotion1: Check index, fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: disable autoinsertion for -async on the output side of the filtergraph.
Michael Niedermayer [Wed, 30 May 2012 13:55:31 +0000 (15:55 +0200)]
ffmpeg: disable autoinsertion for -async on the output side of the filtergraph.

This fixes the issue that since the last merge -async caused 2 aresample
filters to be inserted
users that generate funny timestamps in a filtergraph should probably
manually insert a aresample filter where they need it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: replace 1 line #ifs by if()
Michael Niedermayer [Wed, 30 May 2012 13:27:42 +0000 (15:27 +0200)]
cmdutils: replace 1 line #ifs by if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAllow building of command line utils without swresample lib
Gavin Kinsey [Tue, 29 May 2012 14:43:33 +0000 (14:43 +0000)]
Allow building of command line utils without swresample lib

This allows building ffprobe without swresample

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