ffmpeg.git
6 years agoffmpeg: fix wrap correction code.
Michael Niedermayer [Thu, 23 Aug 2012 23:39:32 +0000 (01:39 +0200)]
ffmpeg: fix wrap correction code.

The code failed with negative timestamps due to using unsigned numbers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpeg: fix fliping with emu edges.
Michael Niedermayer [Thu, 23 Aug 2012 19:53:10 +0000 (21:53 +0200)]
mjpeg: fix fliping with emu edges.

Fixes Ticket121

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix partially hidden macroblocks for 10-bit DNxHD.
Joseph Artsimovich [Thu, 23 Aug 2012 13:51:28 +0000 (14:51 +0100)]
Fix partially hidden macroblocks for 10-bit DNxHD.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1: more than 8 bit per RGB channel
Georg Lippitsch [Thu, 23 Aug 2012 13:54:40 +0000 (15:54 +0200)]
ffv1: more than 8 bit per RGB channel

Add support for GBRP9, GBRP10, GBRP12 and GBRP14 pix formats in ffv1.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolagarith: fix alignment on buffers passed into prediction dsp code.
Michael Niedermayer [Thu, 23 Aug 2012 17:03:57 +0000 (19:03 +0200)]
lagarith: fix alignment on buffers passed into prediction dsp code.

This should fix issues with direct rendering

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/ape: Fix stream duration calculation
jamal [Thu, 23 Aug 2012 02:53:08 +0000 (23:53 -0300)]
lavf/ape: Fix stream duration calculation

Fixes ticket #1662

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg4audio: dont take the SBR flag too serious.
Michael Niedermayer [Thu, 23 Aug 2012 04:35:30 +0000 (06:35 +0200)]
mpeg4audio: dont take the SBR flag too serious.

Fixes Ticket1049

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 23 Aug 2012 12:23:08 +0000 (14:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/APIchanges: add an entry for codec descriptors.
  vorbisenc: set AVCodecContext.bit_rate to 0
  vorbisenc: fix quality parameter
  FATE: add ALAC encoding tests
  lpc: fix alignment of windowed samples for odd maximum LPC order
  alacenc: use s16p sample format as input
  alacenc: remove unneeded sample_fmt check
  alacenc: fix max_frame_size calculation for the final frame
  adpcm_swf: Use correct sample offsets when using trellis.
  rtmp: support strict rtmp servers
  mjpegdec: support AVRn interlaced
  x86: remove FASTDIV inline asm

Conflicts:
doc/APIchanges
libavcodec/mjpegdec.c
libavcodec/vorbisenc.c
libavutil/x86/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: add an entry for codec descriptors.
Anton Khirnov [Wed, 22 Aug 2012 08:37:35 +0000 (10:37 +0200)]
doc/APIchanges: add an entry for codec descriptors.

Also fill in missing dates and hashes.

6 years agovorbisenc: set AVCodecContext.bit_rate to 0
Justin Ruggles [Mon, 20 Aug 2012 17:35:48 +0000 (13:35 -0400)]
vorbisenc: set AVCodecContext.bit_rate to 0

The Vorbis encoder is always VBR.

6 years agovorbisenc: fix quality parameter
Justin Ruggles [Mon, 20 Aug 2012 17:30:44 +0000 (13:30 -0400)]
vorbisenc: fix quality parameter

This generates output with bitrates similar to libvorbis for a given quality
value.

6 years agolavfi: free partial audio buffers when destroying links.
Nicolas George [Wed, 22 Aug 2012 21:31:49 +0000 (23:31 +0200)]
lavfi: free partial audio buffers when destroying links.

Fix a memleak that the recent change of architecture made
more likely to happen.

6 years agoFATE: add ALAC encoding tests
Justin Ruggles [Tue, 21 Aug 2012 16:48:23 +0000 (12:48 -0400)]
FATE: add ALAC encoding tests

6 years agolpc: fix alignment of windowed samples for odd maximum LPC order
Justin Ruggles [Tue, 21 Aug 2012 16:29:11 +0000 (12:29 -0400)]
lpc: fix alignment of windowed samples for odd maximum LPC order

Fixes crash on x86 due to alignment requirements for w_data in
lpc_apply_welch_window_sse2().

6 years agoalacenc: use s16p sample format as input
Justin Ruggles [Tue, 21 Aug 2012 13:21:56 +0000 (09:21 -0400)]
alacenc: use s16p sample format as input

6 years agoalacenc: remove unneeded sample_fmt check
Justin Ruggles [Tue, 21 Aug 2012 15:27:34 +0000 (11:27 -0400)]
alacenc: remove unneeded sample_fmt check

6 years agoalacenc: fix max_frame_size calculation for the final frame
Justin Ruggles [Tue, 21 Aug 2012 15:29:37 +0000 (11:29 -0400)]
alacenc: fix max_frame_size calculation for the final frame

6 years agoFATE: Add Canopus Lossless tests
Derek Buitenhuis [Wed, 22 Aug 2012 19:33:32 +0000 (15:33 -0400)]
FATE: Add Canopus Lossless tests

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideoenc: use dsp.sub_hfyu_median_prediction
Michael Niedermayer [Wed, 22 Aug 2012 14:17:31 +0000 (16:17 +0200)]
utvideoenc: use dsp.sub_hfyu_median_prediction

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideoenc: align mangled buffer starts.
Michael Niedermayer [Wed, 22 Aug 2012 14:13:12 +0000 (16:13 +0200)]
utvideoenc: align mangled buffer starts.

This is essential for fast SIMD accesses.
The same should be done with the predict output.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideoenc: drop step
Michael Niedermayer [Wed, 22 Aug 2012 13:40:17 +0000 (15:40 +0200)]
utvideoenc: drop step

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideoenc: avoid writing into the input picture.
Michael Niedermayer [Wed, 22 Aug 2012 13:37:28 +0000 (15:37 +0200)]
utvideoenc: avoid writing into the input picture.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideoenc: use ff_generate_len()
Michael Niedermayer [Wed, 22 Aug 2012 02:02:38 +0000 (04:02 +0200)]
utvideoenc: use ff_generate_len()

19% faster
smaller files
this may also fix possible integer overflows due to previous 32bit useage

Tested with libutvideo and our utvideo decoder, this patch does not change
decoder output in the test

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/overlay: fix return values.
Nicolas George [Mon, 20 Aug 2012 17:19:16 +0000 (19:19 +0200)]
lavfi/overlay: fix return values.

They were only roughly adapted when error return was
added to the push functions.

6 years agolavfi/split: handle closed outputs.
Nicolas George [Mon, 20 Aug 2012 17:18:46 +0000 (19:18 +0200)]
lavfi/split: handle closed outputs.

Return AVERROR_EOF if all outputs are closed.

6 years agoffmpeg: use close_output_stream more systematically.
Nicolas George [Mon, 20 Aug 2012 09:08:34 +0000 (11:08 +0200)]
ffmpeg: use close_output_stream more systematically.

6 years agoffmpeg: move close_output_stream earlier.
Nicolas George [Mon, 20 Aug 2012 08:57:18 +0000 (10:57 +0200)]
ffmpeg: move close_output_stream earlier.

It will avoid a forward declaration.

6 years agoffmpeg: make decoding_needed a counter.
Nicolas George [Sun, 19 Aug 2012 21:59:41 +0000 (23:59 +0200)]
ffmpeg: make decoding_needed a counter.

6 years agolavfi: add a closed field to AVFilerLink.
Nicolas George [Sun, 19 Aug 2012 17:26:58 +0000 (19:26 +0200)]
lavfi: add a closed field to AVFilerLink.

It will help forward errors and maintain consistency.

6 years agoffmpeg: use AV_BUFFERSRC_FLAG_PUSH.
Nicolas George [Sun, 19 Aug 2012 16:08:40 +0000 (18:08 +0200)]
ffmpeg: use AV_BUFFERSRC_FLAG_PUSH.

It reduces the lifespan of buffers in filter graphs,
and therefore the memory consumption.

6 years agoadpcm_swf: Use correct sample offsets when using trellis.
Justin Ruggles [Mon, 20 Aug 2012 16:18:58 +0000 (12:18 -0400)]
adpcm_swf: Use correct sample offsets when using trellis.

Fixes invalid reads when encoding mono streams when trellis is used.

6 years agortmp: support strict rtmp servers
Samuel Pitoiset [Sun, 19 Aug 2012 11:02:23 +0000 (13:02 +0200)]
rtmp: support strict rtmp servers

In order to send or receive a stream FCPublish, FCSubscribe and _checkbw
are completely optional and often not implemented. releaseStream over a
non-existen stream might report an error instead of being silent.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agomjpegdec: support AVRn interlaced
Michael Niedermayer [Fri, 10 Aug 2012 13:47:07 +0000 (15:47 +0200)]
mjpegdec: support AVRn interlaced

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agohuffman/huffyuv: move lorens huffman table generation code to huffman.c/h
Michael Niedermayer [Wed, 22 Aug 2012 01:57:45 +0000 (03:57 +0200)]
huffman/huffyuv: move lorens huffman table generation code to huffman.c/h

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideoenc: optimize and simplify mangle_rgb_planes
Michael Niedermayer [Wed, 22 Aug 2012 00:47:32 +0000 (02:47 +0200)]
utvideoenc: optimize and simplify mangle_rgb_planes

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: remove FASTDIV inline asm
Mans Rullgard [Sat, 18 Aug 2012 19:22:10 +0000 (20:22 +0100)]
x86: remove FASTDIV inline asm

GCC 4.3 and later do the right thing with the plain C code.  Earlier
versions in 32-bit mode generate one extra instruction, needlessly
zeroing what would be the high half of the shifted value.  At least
two gcc configurations miscompile the inline asm in some situations.

In 64-bit mode, all gcc versions generate imul r64, r64 followed by
shr.  On Intel i7 and later, this imul is faster 32-bit mul.  On
older Intel and all AMD, it is slightly slower.  On Atom it is much
slower.

Considering where the FASTDIV macro is used, any overall negative
performance impact of this change should be negligible.  If anyone
cares, they should file a bug against gcc and get the instruction
selection fixed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 22 Aug 2012 12:37:03 +0000 (14:37 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: x86: Only compile mpegvideo optimizations when necessary
  configure: Drop fastdiv option
  build: Make the E-AC-3 encoder select the AC-3 encoder
  fate: flac: Only run tests requiring samples when samples are available

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/decoding_encoding: flush audio frames in the encoder
Stefano Sabatini [Tue, 21 Aug 2012 20:28:55 +0000 (22:28 +0200)]
examples/decoding_encoding: flush audio frames in the encoder

6 years agoexamples/decoding_encoding: re-organize frame configuration code
Stefano Sabatini [Tue, 21 Aug 2012 18:51:17 +0000 (20:51 +0200)]
examples/decoding_encoding: re-organize frame configuration code

Put the relevant code in one chunk, also check for frame allocation
failures.

6 years agodoc/filters: fix level for the flite Examples subsection
Stefano Sabatini [Tue, 21 Aug 2012 23:21:20 +0000 (01:21 +0200)]
doc/filters: fix level for the flite Examples subsection

6 years agobuild: x86: Only compile mpegvideo optimizations when necessary
Diego Biurrun [Mon, 13 Aug 2012 11:02:38 +0000 (13:02 +0200)]
build: x86: Only compile mpegvideo optimizations when necessary

6 years agodoc/faq: mention doc/examples
Stefano Sabatini [Tue, 21 Aug 2012 18:07:06 +0000 (20:07 +0200)]
doc/faq: mention doc/examples

Also provide a link to the github FFmpeg page containing the examples.

6 years agoexamples/muxing: cast sws_scale() argument to the expected one
Stefano Sabatini [Tue, 21 Aug 2012 16:15:32 +0000 (18:15 +0200)]
examples/muxing: cast sws_scale() argument to the expected one

Fix warnings:
muxing.c: In function ‘write_video_frame’:
muxing.c:326:23: warning: passing argument 2 of ‘sws_scale’ from incompatible pointer type [enabled by default]

6 years agodoc/eval: add missing documentation of functions
Stefano Sabatini [Tue, 21 Aug 2012 11:16:13 +0000 (13:16 +0200)]
doc/eval: add missing documentation of functions

6 years agodoc/filters: itemize examples for pad filter, and fix a few typos
Stefano Sabatini [Tue, 21 Aug 2012 10:34:10 +0000 (12:34 +0200)]
doc/filters: itemize examples for pad filter, and fix a few typos

6 years agoconfigure: Drop fastdiv option
Diego Biurrun [Mon, 20 Aug 2012 22:36:16 +0000 (00:36 +0200)]
configure: Drop fastdiv option

There is no point in having the user disable any fastdiv macros.
Besides the condition implementation was broken and only disabled
the C implementation, but no platform specific assembly versions.

6 years agobuild: Make the E-AC-3 encoder select the AC-3 encoder
Diego Biurrun [Sun, 19 Aug 2012 21:19:38 +0000 (23:19 +0200)]
build: Make the E-AC-3 encoder select the AC-3 encoder

The E-AC-3 encoder depends on almost all of the code of the AC-3
encoder, so it makes no sense to enable one without the other.

6 years agofate: flac: Only run tests requiring samples when samples are available
Diego Biurrun [Tue, 21 Aug 2012 22:45:28 +0000 (00:45 +0200)]
fate: flac: Only run tests requiring samples when samples are available

6 years agoavrn: lowercase "name" and expand"long_name"
Piotr Bandurski [Tue, 21 Aug 2012 19:48:13 +0000 (21:48 +0200)]
avrn: lowercase "name" and expand"long_name"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: Change default aac priming fallback from 2112 to 1024
Justin Greer [Tue, 21 Aug 2012 20:00:55 +0000 (22:00 +0200)]
mov: Change default aac priming fallback from 2112 to 1024

This fixes priming for faac

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: parse custom "----" Metadata
Justin Greer [Tue, 21 Aug 2012 19:57:45 +0000 (21:57 +0200)]
mov: parse custom "----" Metadata

This fixes the priming samples for NERO AAC LC

Simplified-by: Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 21 Aug 2012 14:17:13 +0000 (16:17 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dirac: use meaningful return values
  flacdec: simplify sample buffer handling
  flacdec: simplify loop in decode_residuals()
  fate: make Ut Video encoder tests use bitexact swscale flags
  build: amrwb: Drop redundant lsp dependency declaration
  fate: fix utvideoenc tests

Conflicts:
libavcodec/dirac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodirac: use meaningful return values
Jordi Ortiz [Tue, 21 Aug 2012 13:09:40 +0000 (15:09 +0200)]
dirac: use meaningful return values

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavf: remove unused AVStream pointer.
Clément Bœsch [Tue, 21 Aug 2012 11:48:08 +0000 (13:48 +0200)]
lavf: remove unused AVStream pointer.

6 years agolavf: add const qualifier to AVCodecDescriptor pointer in is_intra_only().
Clément Bœsch [Tue, 21 Aug 2012 11:47:43 +0000 (13:47 +0200)]
lavf: add const qualifier to AVCodecDescriptor pointer in is_intra_only().

Fix "assignment discards ‘const’ qualifier from pointer target type" warnings.

6 years agoflacdec: simplify sample buffer handling
Mans Rullgard [Mon, 2 Jul 2012 00:59:04 +0000 (01:59 +0100)]
flacdec: simplify sample buffer handling

Pass pointer to sample buffer instead of channel number to various
functions called from decode_subframe().  Also simplify a few
expressions within this function.

6 years agoflacdec: simplify loop in decode_residuals()
Mans Rullgard [Mon, 2 Jul 2012 21:39:34 +0000 (22:39 +0100)]
flacdec: simplify loop in decode_residuals()

6 years agofate: make Ut Video encoder tests use bitexact swscale flags
Jan Ekström [Mon, 20 Aug 2012 18:16:42 +0000 (21:16 +0300)]
fate: make Ut Video encoder tests use bitexact swscale flags

The failures on various architectures and compilers on the RGB(A)
tests seem to have been because of one-off YCbCr->RGB conversion
results. This should make the conversion results match on most if
not all code paths.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agodoc/ffmpeg: extend documentation for -(no)stdin option
Stefano Sabatini [Mon, 20 Aug 2012 23:42:47 +0000 (01:42 +0200)]
doc/ffmpeg: extend documentation for -(no)stdin option

Fix trac ticket #1665.

6 years agofate: make Ut Video encoder tests use bitexact swscale flags
Jan Ekström [Mon, 20 Aug 2012 18:16:42 +0000 (21:16 +0300)]
fate: make Ut Video encoder tests use bitexact swscale flags

The failures on various architectures and compilers on the RGB(A)
tests seem to have been because of one-off YCbCr->RGB conversion
results. This should make the conversion results match on most if
not all code paths.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agormdec: parse logical-fileinfo, instead of creating phantom tracks
Michael Niedermayer [Tue, 21 Aug 2012 04:15:22 +0000 (06:15 +0200)]
rmdec: parse logical-fileinfo, instead of creating phantom tracks

Fixes Ticket1090

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agormdec: pass mime type to ff_rm_read_mdpr_codecdata()
Michael Niedermayer [Tue, 21 Aug 2012 04:14:29 +0000 (06:14 +0200)]
rmdec: pass mime type to ff_rm_read_mdpr_codecdata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: factor ff_free_stream() out
Michael Niedermayer [Tue, 21 Aug 2012 04:13:54 +0000 (06:13 +0200)]
lavf: factor ff_free_stream() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohls: fix min DTS code, try #2
Michael Niedermayer [Mon, 20 Aug 2012 23:48:04 +0000 (01:48 +0200)]
hls: fix min DTS code, try #2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohls: fix EOF check
Michael Niedermayer [Mon, 20 Aug 2012 23:47:29 +0000 (01:47 +0200)]
hls: fix EOF check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/showspectrum: add priv_class and flags to options
Stefano Sabatini [Mon, 20 Aug 2012 23:03:36 +0000 (01:03 +0200)]
lavfi/showspectrum: add priv_class and flags to options

6 years agohls: use av_compare_ts() instead of comparing apples to oranges.
Michael Niedermayer [Mon, 20 Aug 2012 23:00:05 +0000 (01:00 +0200)]
hls: use av_compare_ts() instead of comparing apples to oranges.

Fixes Ticket983

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/asyncts: Fix compilation with GCC 4.7
Thomas Weber [Mon, 20 Aug 2012 20:54:03 +0000 (22:54 +0200)]
lavfi/asyncts: Fix compilation with GCC 4.7

Compilation failed since commit 42d621d131a45fb63571ca6029c2fc4f02811c10
Error messages:
libavfilter/af_asyncts.c:249:5: error: initializer element is not
computable at load time
libavfilter/af_asyncts.c:249:5: error: (near initialization for
‘avfilter_af_asyncts.priv_size’)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: remove outdated warning.
Nicolas George [Sun, 19 Aug 2012 10:14:29 +0000 (12:14 +0200)]
ffmpeg: remove outdated warning.

-t works with complex filters now.

6 years agolavf/nutenc: write stream metadata.
Nicolas George [Sat, 18 Aug 2012 22:30:30 +0000 (00:30 +0200)]
lavf/nutenc: write stream metadata.

6 years agolavf/nut: define fourcc DVBT for DVB_TELETEXT.
Nicolas George [Sat, 18 Aug 2012 21:52:55 +0000 (23:52 +0200)]
lavf/nut: define fourcc DVBT for DVB_TELETEXT.

Allow "-map 0:s -c:s copy" to copy all subtitles streams.

6 years agoffmpeg: remove useless flags to EOF av_buffersrc_add_ref.
Nicolas George [Sun, 19 Aug 2012 17:02:31 +0000 (19:02 +0200)]
ffmpeg: remove useless flags to EOF av_buffersrc_add_ref.

6 years agolavfi/buffersrc: add AV_BUFFERSRC_FLAG_PUSH.
Nicolas George [Sun, 19 Aug 2012 16:08:24 +0000 (18:08 +0200)]
lavfi/buffersrc: add AV_BUFFERSRC_FLAG_PUSH.

6 years agolavfi/edgedetect: use "@see" instead of the invalid "@url".
Clément Bœsch [Mon, 20 Aug 2012 21:12:34 +0000 (23:12 +0200)]
lavfi/edgedetect: use "@see" instead of the invalid "@url".

6 years agolavfi: add showspectrum filter.
Clément Bœsch [Thu, 29 Dec 2011 22:45:45 +0000 (23:45 +0100)]
lavfi: add showspectrum filter.

6 years agoh264: fix variable overflow after a few years of video playback
Michael Niedermayer [Mon, 20 Aug 2012 20:30:00 +0000 (22:30 +0200)]
h264: fix variable overflow after a few years of video playback

Found-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofix spelling
rogerdpack [Sun, 19 Aug 2012 14:58:49 +0000 (08:58 -0600)]
fix spelling

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow:protect access to curbufsize to promote consistency
rogerdpack [Sun, 19 Aug 2012 14:10:07 +0000 (08:10 -0600)]
dshow:protect access to curbufsize to promote consistency

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow: avoid integer overflow when using curbufsize
rogerdpack [Sun, 19 Aug 2012 12:52:03 +0000 (06:52 -0600)]
dshow: avoid integer overflow when using curbufsize

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideoenc: Port to ff_alloc_packet2
Derek Buitenhuis [Mon, 20 Aug 2012 18:07:41 +0000 (14:07 -0400)]
utvideoenc: Port to ff_alloc_packet2

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: fix utvideoenc tests
Mans Rullgard [Mon, 20 Aug 2012 13:58:02 +0000 (14:58 +0100)]
fate: fix utvideoenc tests

For some reason, the prerequisites have to be specified like this.
Make works in mysterious ways.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agorename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT
XhmikosR [Sun, 19 Aug 2012 17:19:19 +0000 (13:19 -0400)]
rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 20 Aug 2012 15:15:15 +0000 (17:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Add FATE tests for the Ut Video encoder
  lavc: add Ut Video encoder
  mpegvideo_enc: remove stray duplicate line from 7f9aaa4
  swscale: x86: fix #endif comments in rgb2rgb template file
  avconv: mark more options as expert.
  avconv: split printing "main options" into global and per-file.
  avconv: refactor help printing.

Conflicts:
Changelog
ffmpeg_opt.c
ffserver.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'
Michael Niedermayer [Mon, 20 Aug 2012 15:03:04 +0000 (17:03 +0200)]
Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

* commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174':
  avconv: print info/capabilities options in a separate help group.
  avtools: add -h demuxer/muxer
  cmdutils: extend -h to allow printing codec details.

Conflicts:
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'
Michael Niedermayer [Mon, 20 Aug 2012 14:52:42 +0000 (16:52 +0200)]
Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'

* commit '7c5012127fb7e18f0616011257bb4248f6a8b608':
  cmdutils: change semantics of show_help_options() and document it.
  avtools: move some newlines to show_help_options().
  avconv: deprecate -isync.

Conflicts:
ffmpeg_opt.c
ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8fc83fb081963001e1197c6fdd59fd2af415078a'
Michael Niedermayer [Mon, 20 Aug 2012 14:44:05 +0000 (16:44 +0200)]
Merge commit '8fc83fb081963001e1197c6fdd59fd2af415078a'

* commit '8fc83fb081963001e1197c6fdd59fd2af415078a':
  avconv: reformat the options table.

Conflicts:
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: amrwb: Drop redundant lsp dependency declaration
Diego Biurrun [Mon, 13 Aug 2012 23:51:15 +0000 (01:51 +0200)]
build: amrwb: Drop redundant lsp dependency declaration

6 years agofate: fix utvideoenc tests
Mans Rullgard [Mon, 20 Aug 2012 13:58:02 +0000 (14:58 +0100)]
fate: fix utvideoenc tests

For some reason, the prerequisites have to be specified like this.
Make works in mysterious ways.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoffmpeg_opt: get rid of casts for the HAS_ARG case
Michael Niedermayer [Mon, 20 Aug 2012 14:05:59 +0000 (16:05 +0200)]
ffmpeg_opt: get rid of casts for the HAS_ARG case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: remove casts for OPT_FUNC2
Michael Niedermayer [Mon, 20 Aug 2012 14:04:10 +0000 (16:04 +0200)]
ffmpeg_opt: remove casts for OPT_FUNC2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: fix copy_tb
Michael Niedermayer [Mon, 20 Aug 2012 14:02:03 +0000 (16:02 +0200)]
ffmpeg_opt: fix copy_tb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'
Michael Niedermayer [Mon, 20 Aug 2012 13:48:21 +0000 (15:48 +0200)]
Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'

* commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf':
  avconv: get rid of ugly casts in the options table.
  avconv: try to match codecs by codec descriptor name as a last resort.
  avtools: fix show_foo() signatures.

Conflicts:
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
ffmpeg_opt.c
ffplay.c
ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix duplicate packet init introduced by 7f9aaa4
Wolfram Gloger [Mon, 20 Aug 2012 11:17:35 +0000 (13:17 +0200)]
Fix duplicate packet init introduced by 7f9aaa4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Add FATE tests for the Ut Video encoder
Jan Ekström [Sun, 19 Aug 2012 17:07:13 +0000 (20:07 +0300)]
fate: Add FATE tests for the Ut Video encoder

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavc: add Ut Video encoder
Jan Ekström [Mon, 20 Aug 2012 09:15:34 +0000 (12:15 +0300)]
lavc: add Ut Video encoder

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agompegvideo_enc: remove stray duplicate line from 7f9aaa4
Anton Khirnov [Sun, 19 Aug 2012 17:28:52 +0000 (19:28 +0200)]
mpegvideo_enc: remove stray duplicate line from 7f9aaa4

6 years agoh264: Workaround invalid MPEG-TS broadcasts
Michael Niedermayer [Mon, 20 Aug 2012 03:36:52 +0000 (05:36 +0200)]
h264: Workaround invalid MPEG-TS broadcasts

Fixes seeking to the first keyframe
Fixes Ticket1029

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavrndec: add DR1 capability flag
Michael Niedermayer [Mon, 20 Aug 2012 01:31:41 +0000 (03:31 +0200)]
avrndec: add DR1 capability flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAVRn: fix progressive
Michael Niedermayer [Mon, 20 Aug 2012 00:50:59 +0000 (02:50 +0200)]
AVRn: fix progressive

Fixes Ticket970

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: move AVRn to a seperate decoder.
Michael Niedermayer [Mon, 20 Aug 2012 00:19:37 +0000 (02:19 +0200)]
lavc: move AVRn to a seperate decoder.

The special cases in demuxers and decoders are a mess otherwise (and more
would be needed to support it fully)

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