ffmpeg.git
7 years agolavfi: move tracing utilities definition from video.c to avfilter.c
Stefano Sabatini [Fri, 1 Jun 2012 21:05:13 +0000 (23:05 +0200)]
lavfi: move tracing utilities definition from video.c to avfilter.c

These utilities are meant to be defined in avfilter.c, since they are
generic and thus contain both audio and video code.

7 years agoAdd missing CRLFs to avisynth error messages.
Carl Eugen Hoyos [Tue, 5 Jun 2012 09:13:30 +0000 (11:13 +0200)]
Add missing CRLFs to avisynth error messages.

7 years agoFix MP2 muxer Makefile dependencies.
Carl Eugen Hoyos [Tue, 5 Jun 2012 07:54:03 +0000 (09:54 +0200)]
Fix MP2 muxer Makefile dependencies.

Found, analysed and tested by trac user Jamal.

Fixes ticket #1411

7 years agolavfi/select: use exported dsputil_init function.
Clément Bœsch [Tue, 5 Jun 2012 05:27:41 +0000 (07:27 +0200)]
lavfi/select: use exported dsputil_init function.

This is the deprecated version of the function but it is exported, so it
should fix the shared FATE box.

7 years agoMANGLEd swscale x86 asm to save registers
Michael Bradshaw [Mon, 4 Jun 2012 19:15:58 +0000 (13:15 -0600)]
MANGLEd swscale x86 asm to save registers

register starvation caused gcc4.2 to fail building 32 bit shared libs
on 64 bit OS X

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoupdate filtering_audio example
Andrew Wason [Mon, 4 Jun 2012 18:07:15 +0000 (14:07 -0400)]
update filtering_audio example

The filtering_audio.c example needs to be updated for the new
"abuffer" filter args.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/select: 10l: llabs -> fabs after switching types.
Clément Bœsch [Mon, 4 Jun 2012 22:17:38 +0000 (00:17 +0200)]
lavfi/select: 10l: llabs -> fabs after switching types.

7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Mon, 4 Jun 2012 21:35:36 +0000 (23:35 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: calculate audio diff threshold based on the actual settings
  ffplay: try more channel count combinations for SDL_OpenAudio
  ffplay: simplify audio_open, rename parameters to more explanatory names
  ffplay: remove VideoState from audio_open
  ffplay: put audio parameters to their own struct
  ffplay: put audio_open into a seperate function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 4 Jun 2012 20:54:15 +0000 (22:54 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Write chan atom for all audio tracks in mov mode movies.
  mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing
  doc/avconv: add some details about the transcoding process.
  avidec: make scale and rate unsigned.
  avconv: check output stream recording time before each frame returned from filters
  avconv: split selecting input file out of transcode().
  avconv: split checking for active outputs out of transcode().
  avfiltergraph: make some functions static.

Conflicts:
ffmpeg.c
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavformat/mpegtsenc.c
tests/ref/fate/acodec-alac
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8
tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: remove two unused variables.
Clément Bœsch [Mon, 4 Jun 2012 20:32:26 +0000 (22:32 +0200)]
ffmpeg: remove two unused variables.

7 years agoChangelog: add ffprobe flat output.
Clément Bœsch [Mon, 4 Jun 2012 19:46:24 +0000 (21:46 +0200)]
Changelog: add ffprobe flat output.

7 years agolavfi/select: add scene detection.
Clément Bœsch [Sat, 26 May 2012 10:38:59 +0000 (12:38 +0200)]
lavfi/select: add scene detection.

Based on the shotdetect algorithm (http://shotdetect.nonutc.fr/ by Johan
MATHE johan.mathe tremplin-utc.net).

7 years agoDo not try to encode DVCPRO HD, it produces broken files.
Carl Eugen Hoyos [Mon, 4 Jun 2012 18:42:00 +0000 (20:42 +0200)]
Do not try to encode DVCPRO HD, it produces broken files.

7 years agoAllow colour space autodetection when encoding ljpeg.
Carl Eugen Hoyos [Mon, 4 Jun 2012 18:01:39 +0000 (20:01 +0200)]
Allow colour space autodetection when encoding ljpeg.

This works as expected if the input stream is not yuv4xxp.

Reviewed-by: Paul B Mahol
7 years agoRemove misplaced comment.
Carl Eugen Hoyos [Mon, 4 Jun 2012 18:01:36 +0000 (20:01 +0200)]
Remove misplaced comment.

7 years agoffprobe/flat: add escape for '`' and '$'.
Clément Bœsch [Mon, 4 Jun 2012 17:14:51 +0000 (19:14 +0200)]
ffprobe/flat: add escape for '`' and '$'.

7 years agomovenc: Write chan atom for all audio tracks in mov mode movies.
Alex Converse [Thu, 31 May 2012 00:51:12 +0000 (17:51 -0700)]
movenc: Write chan atom for all audio tracks in mov mode movies.

7 years agoffmpeg: disable audio volume insertion on the output side.
Michael Niedermayer [Mon, 4 Jun 2012 13:46:59 +0000 (15:46 +0200)]
ffmpeg: disable audio volume insertion on the output side.

This fixes -vol leading to 2 inserted volume filters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegtsenc: use avio_open_dyn_buf(), zero pointers after freeing
Jindřich Makovička [Sun, 3 Jun 2012 04:11:10 +0000 (06:11 +0200)]
mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing

Per suggestion by Michael Niedermayer.

Signed-off-by: Jindřich Makovička <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodoc/avconv: add some details about the transcoding process.
Anton Khirnov [Mon, 4 Jun 2012 09:00:34 +0000 (11:00 +0200)]
doc/avconv: add some details about the transcoding process.

7 years agoavidec: make scale and rate unsigned.
Anton Khirnov [Mon, 4 Jun 2012 09:36:51 +0000 (11:36 +0200)]
avidec: make scale and rate unsigned.

The specs say they are unsigned 32bit integers.

7 years agoavconv: check output stream recording time before each frame returned from filters
Anton Khirnov [Sun, 3 Jun 2012 09:35:38 +0000 (11:35 +0200)]
avconv: check output stream recording time before each frame returned from filters

There may be multiple frames returned, so with just one check we can
write more than requested to the output.

7 years agoavconv: split selecting input file out of transcode().
Anton Khirnov [Fri, 1 Jun 2012 09:00:27 +0000 (11:00 +0200)]
avconv: split selecting input file out of transcode().

7 years agoavconv: split checking for active outputs out of transcode().
Anton Khirnov [Fri, 1 Jun 2012 08:44:11 +0000 (10:44 +0200)]
avconv: split checking for active outputs out of transcode().

7 years agoavfiltergraph: make some functions static.
Anton Khirnov [Wed, 16 May 2012 05:59:52 +0000 (07:59 +0200)]
avfiltergraph: make some functions static.

They are not used outside of avfiltergraph.c

7 years agolibopenjpeg: YUV410P and YUV411P support
Paul B Mahol [Fri, 1 Jun 2012 12:18:05 +0000 (12:18 +0000)]
libopenjpeg: YUV410P and YUV411P support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoFix compilation condition for some ProRes dsp encoder functions.
Carl Eugen Hoyos [Mon, 4 Jun 2012 10:18:56 +0000 (12:18 +0200)]
Fix compilation condition for some ProRes dsp encoder functions.

Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.

7 years agoFix compilation condition for some ProRes dsp decoder functions.
Carl Eugen Hoyos [Mon, 4 Jun 2012 10:15:41 +0000 (12:15 +0200)]
Fix compilation condition for some ProRes dsp decoder functions.

Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.

7 years agoFix ProRes decoder Makefile dependencies.
Carl Eugen Hoyos [Mon, 4 Jun 2012 10:07:30 +0000 (12:07 +0200)]
Fix ProRes decoder Makefile dependencies.

Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.

7 years agoFix G.723.1 encoder Makefile dependencies.
Carl Eugen Hoyos [Mon, 4 Jun 2012 10:06:48 +0000 (12:06 +0200)]
Fix G.723.1 encoder Makefile dependencies.

7 years agoffmpeg: add missing return carriage in error message.
Clément Bœsch [Mon, 4 Jun 2012 07:09:13 +0000 (09:09 +0200)]
ffmpeg: add missing return carriage in error message.

7 years agooptions: stop after option is found.
Clément Bœsch [Wed, 30 May 2012 12:40:28 +0000 (14:40 +0200)]
options: stop after option is found.

This reverts 78da04384a6c22820518706d84631006d31a85ea; it is not
required anymore since the previous commit (these extended checks were
for the -timecode option in both muxers and encoders), and reduces the
diff with the fork.

7 years agotimecode: move timecode muxer options to metadata.
Clément Bœsch [Wed, 30 May 2012 08:26:53 +0000 (10:26 +0200)]
timecode: move timecode muxer options to metadata.

Some demuxers set a timecode in the format or streams metadata. The
muxers now make use of this metadata instead of a duplicated private
option.

This makes possible transparent copy of the timecode when transmuxing
and transcoding.

-timecode option for MPEG1/2 codec is also renamed to -gop_timecode. The
global ffmpeg -timecode option will set it anyway so no option change
visible for the user.

7 years agolavfi: use av_default_item_name() as filter private context logger
Stefano Sabatini [Mon, 4 Jun 2012 00:31:49 +0000 (02:31 +0200)]
lavfi: use av_default_item_name() as filter private context logger

avfilter_default_filter_name() is supposed to access an AVFilterContext
struct, if used with a private struct it will cause a crash since it will
access fields which are non defined in the private struct.

7 years agoffv1dec: print more information for -debug 1
Michael Niedermayer [Sun, 3 Jun 2012 23:00:26 +0000 (01:00 +0200)]
ffv1dec: print more information for -debug 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: fix log level of FF_DEBUG_PICT_INFO
Michael Niedermayer [Sun, 3 Jun 2012 22:55:02 +0000 (00:55 +0200)]
ffv1: fix log level of FF_DEBUG_PICT_INFO

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: be more verbose when printing an error in transcode()
Stefano Sabatini [Fri, 1 Jun 2012 16:24:02 +0000 (18:24 +0200)]
ffmpeg: be more verbose when printing an error in transcode()

Helps debuggability.

7 years agoffmpeg: specify more meaningful names for the lavfi buffer sources
Stefano Sabatini [Fri, 1 Jun 2012 12:46:19 +0000 (14:46 +0200)]
ffmpeg: specify more meaningful names for the lavfi buffer sources

7 years agolavfi: add avfilter_default_filter_name()
Stefano Sabatini [Fri, 1 Jun 2012 12:46:54 +0000 (14:46 +0200)]
lavfi: add avfilter_default_filter_name()

The function is modelled after av_default_item_name(), and will print the
name of the instance filter if defined, otherwise the name of the filter.

This allows to show the instance name in the log, which is useful when
debugging complex filter graphs.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 3 Jun 2012 22:33:42 +0000 (00:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  librtmp: return AVERROR_UNKNOWN instead of -1.
  librtmp: don't abuse a variable for two unrelated things.
  librtmp: add rtmp_app and rtmp_playpath private options.
  bmv: add stricter checks for invalid decoded length
  avpacket: fix duplicating side data.
  flv: support stream text data as onTextData

Conflicts:
libavcodec/bmv.c
libavformat/flvdec.c
libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/raw: add test utility for listing fourcc/pix_fmt map
Stefano Sabatini [Fri, 25 May 2012 23:23:04 +0000 (01:23 +0200)]
lavc/raw: add test utility for listing fourcc/pix_fmt map

The test program is useful for checking which raw formats are currently
identified by a codec tag.

7 years agolavfi/lut: fix component -> rgba mapping
Stefano Sabatini [Thu, 31 May 2012 08:11:09 +0000 (10:11 +0200)]
lavfi/lut: fix component -> rgba mapping

7 years agoffmpeg: use filter time base as codec time base.
Nicolas George [Wed, 23 May 2012 12:31:30 +0000 (14:31 +0200)]
ffmpeg: use filter time base as codec time base.

7 years agoffmpeg: avoid NULL dereference with filters.
Nicolas George [Wed, 23 May 2012 19:19:16 +0000 (21:19 +0200)]
ffmpeg: avoid NULL dereference with filters.

icodec can be NULL if there is no input stream
clearly associated with the output stream.

7 years agolog: color prefixes according to their source.
Michael Niedermayer [Mon, 28 May 2012 01:09:55 +0000 (03:09 +0200)]
log: color prefixes according to their source.

The use of cyan is droped from the levels to avoid confusion
magenta/cyan/blue is used for muxer/codec/filter layer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolog: add AV_CLASS_CATEGORY_NB
Michael Niedermayer [Sun, 3 Jun 2012 19:57:17 +0000 (21:57 +0200)]
log: add AV_CLASS_CATEGORY_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolog: cleanup color arrays
Michael Niedermayer [Sun, 3 Jun 2012 19:56:35 +0000 (21:56 +0200)]
log: cleanup color arrays

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoset some categories of some AVClass structs
Michael Niedermayer [Mon, 28 May 2012 10:50:06 +0000 (12:50 +0200)]
set some categories of some AVClass structs

Please help setting the category for all remaining AVClasses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompc8: fix channel checks
Michael Niedermayer [Sun, 3 Jun 2012 15:40:30 +0000 (17:40 +0200)]
mpc8: fix channel checks

fix heap array overflow

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoav_get_audio_frame_duration: fix FPE
Michael Niedermayer [Sun, 3 Jun 2012 15:12:26 +0000 (17:12 +0200)]
av_get_audio_frame_duration: fix FPE

Fixes ticket1392

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibrtmp: return AVERROR_UNKNOWN instead of -1.
Anton Khirnov [Sun, 3 Jun 2012 08:11:43 +0000 (10:11 +0200)]
librtmp: return AVERROR_UNKNOWN instead of -1.

7 years agolibrtmp: don't abuse a variable for two unrelated things.
Anton Khirnov [Sun, 3 Jun 2012 08:09:03 +0000 (10:09 +0200)]
librtmp: don't abuse a variable for two unrelated things.

7 years agolibrtmp: add rtmp_app and rtmp_playpath private options.
Anton Khirnov [Sun, 3 Jun 2012 08:07:54 +0000 (10:07 +0200)]
librtmp: add rtmp_app and rtmp_playpath private options.

This makes it easier to switch between native rtmp and librtmp.

7 years agobmv: add stricter checks for invalid decoded length
Kostya Shishkov [Fri, 1 Jun 2012 18:51:57 +0000 (20:51 +0200)]
bmv: add stricter checks for invalid decoded length

This makes decoder handle random data passed as BMV frame data.

7 years agomace: check channel count, fixes FPE
Michael Niedermayer [Sun, 3 Jun 2012 12:53:43 +0000 (14:53 +0200)]
mace: check channel count, fixes FPE

Fixes ticket1391

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh263: disable loop filter with lowres
Michael Niedermayer [Sun, 3 Jun 2012 12:41:21 +0000 (14:41 +0200)]
h263: disable loop filter with lowres

Fixes ticket1212

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 agoavpacket: fix duplicating side data.
Anton Khirnov [Sat, 2 Jun 2012 11:49:13 +0000 (13:49 +0200)]
avpacket: fix duplicating side data.

Use correct side data size instead of just zeroed field.

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 agoflv: support stream text data as onTextData
Luca Barbato [Wed, 9 May 2012 21:35:58 +0000 (14:35 -0700)]
flv: support stream text data as onTextData

Adobe specifies onTextData as the standard message to use to deliver
text information.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
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 agoffplay: calculate audio diff threshold based on the actual settings
Marton Balint [Sat, 2 Jun 2012 19:40:12 +0000 (21:40 +0200)]
ffplay: calculate audio diff threshold based on the actual settings

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: try more channel count combinations for SDL_OpenAudio
Marton Balint [Fri, 1 Jun 2012 23:26:17 +0000 (01:26 +0200)]
ffplay: try more channel count combinations for SDL_OpenAudio

This should fix ticket 1384.

Signed-off-by: Marton Balint <cus@passwd.hu>
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 agoffplay: simplify audio_open, rename parameters to more explanatory names
Marton Balint [Sat, 14 Apr 2012 16:27:58 +0000 (18:27 +0200)]
ffplay: simplify audio_open, rename parameters to more explanatory names

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: remove VideoState from audio_open
Marton Balint [Sat, 14 Apr 2012 16:07:58 +0000 (18:07 +0200)]
ffplay: remove VideoState from audio_open

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: put audio parameters to their own struct
Marton Balint [Sat, 14 Apr 2012 15:53:45 +0000 (17:53 +0200)]
ffplay: put audio parameters to their own struct

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: put audio_open into a seperate function
Marton Balint [Sat, 14 Apr 2012 14:19:15 +0000 (16:19 +0200)]
ffplay: put audio_open into a seperate function

Signed-off-by: Marton Balint <cus@passwd.hu>
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>