ffmpeg.git
8 years agoH.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF n0.7.1
Jason Garrett-Glaser [Wed, 22 Jun 2011 09:34:02 +0000 (02:34 -0700)]
H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF
(cherry picked from commit 2702a6f114f996ddfb334f1d8ddfae50e2c7eef7)

8 years agoH.264: fix 4:4:4 + deblocking + MBAFF
Jason Garrett-Glaser [Wed, 22 Jun 2011 09:05:14 +0000 (02:05 -0700)]
H.264: fix 4:4:4 + deblocking + MBAFF
(cherry picked from commit 7c9079ab4cf0bcf34103fc9c5e49ec1fd7dd390c)

8 years agoH.264: fix 4:4:4 cropping warning
Jason Garrett-Glaser [Tue, 21 Jun 2011 11:16:33 +0000 (04:16 -0700)]
H.264: fix 4:4:4 cropping warning
(cherry picked from commit 932db250243812380640112fd27a59bc0642bc8a)

8 years agoH.264: reference the correct SPS in decode_scaling_matrices
Jason Garrett-Glaser [Tue, 21 Jun 2011 08:10:37 +0000 (01:10 -0700)]
H.264: reference the correct SPS in decode_scaling_matrices
(cherry picked from commit 85a88f9c0c0fcc2fc48121db1beb5ada68d24bdc)

8 years agorelease_notes: update for 0.7.1
Michael Niedermayer [Wed, 22 Jun 2011 21:21:19 +0000 (23:21 +0200)]
release_notes: update for 0.7.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoset VERSION for 0.7.1
Michael Niedermayer [Wed, 22 Jun 2011 21:19:34 +0000 (23:19 +0200)]
set VERSION for 0.7.1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_mp: do not add duplicated pixel formats.
Clément Bœsch [Wed, 22 Jun 2011 08:33:01 +0000 (10:33 +0200)]
vf_mp: do not add duplicated pixel formats.

This avoid a crash with in avfilter_merge_formats() in case one of the
filter formats list has multiple time the same entry.

Thanks to Mina Nagy Zaki for helping figuring out the issue.
(cherry picked from commit 680e47364386038c5039345ef2d9fe6947191a12)

8 years agoffplay: use new avformat_open_* API.
Anton Khirnov [Thu, 9 Jun 2011 08:58:23 +0000 (10:58 +0200)]
ffplay: use new avformat_open_* API.
(cherry picked from commit 44e83d0c976dd098455173877fc22b57ed212bed)

8 years agoRevert needless API change in 05e84c95.
Reimar Döffinger [Wed, 22 Jun 2011 16:25:49 +0000 (18:25 +0200)]
Revert needless API change in 05e84c95.

When providing a custom AVIOContex for a AVFMT_NOFILE format
only print a warning instead of erroring out.
This allows the code to work with older MPlayer versions that
just always set pb out of laziness.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoMerge branch 'master' into oldabi
Michael Niedermayer [Tue, 21 Jun 2011 19:55:46 +0000 (21:55 +0200)]
Merge branch 'master' into oldabi

* master:
  ffplay: do not init SDL audio if -an is specified.
  Fix zero-length gnu_printf format string warning.
  A cmp instruction with two constants is invalid, thus "g" constraint is not correct but must be "rm" instead.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffplay: do not init SDL audio if -an is specified. n0.8
Clément Bœsch [Tue, 21 Jun 2011 09:25:25 +0000 (11:25 +0200)]
ffplay: do not init SDL audio if -an is specified.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix zero-length gnu_printf format string warning.
Clément Bœsch [Wed, 15 Jun 2011 09:24:00 +0000 (11:24 +0200)]
Fix zero-length gnu_printf format string warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoA cmp instruction with two constants is invalid, thus "g" constraint
Reimar Döffinger [Tue, 21 Jun 2011 19:41:04 +0000 (21:41 +0200)]
A cmp instruction with two constants is invalid, thus "g" constraint
is not correct but must be "rm" instead.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge branch 'master' into oldabi
Michael Niedermayer [Tue, 21 Jun 2011 19:13:49 +0000 (21:13 +0200)]
Merge branch 'master' into oldabi

* master:
  release_notes: document not fully understood mingw-sdl issue
  release_notes: some updates
  presets: forgotten libvpx presets
  release_notes: fix version
  release_notes: mention more codecs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  release_notes: there will be 2 releases each for one ABI/API.
  release_notes: suggest git log instead of the poorly maintained APIChanges
  release_notes: we do support releases
  build system: disable memalign on haiku, its not reliable there.
  ffprobe: remove duplicate avformat_alloc_context()
  Fix segmentation fault in ffprobe
  wma: fix infinite loop
  Fix H.264 4:4:4 lossless decoding.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorelease_notes: document not fully understood mingw-sdl issue
Michael Niedermayer [Tue, 21 Jun 2011 18:58:39 +0000 (20:58 +0200)]
release_notes: document not fully understood mingw-sdl issue

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorelease_notes: some updates
Michael Niedermayer [Tue, 21 Jun 2011 16:16:16 +0000 (18:16 +0200)]
release_notes: some updates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopresets: forgotten libvpx presets
Michael Niedermayer [Tue, 21 Jun 2011 15:52:16 +0000 (17:52 +0200)]
presets: forgotten libvpx presets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorelease_notes: fix version
Michael Niedermayer [Tue, 21 Jun 2011 15:08:01 +0000 (17:08 +0200)]
release_notes: fix version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorelease_notes: mention more codecs
Michael Niedermayer [Tue, 21 Jun 2011 15:06:35 +0000 (17:06 +0200)]
release_notes: mention more codecs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorelease_notes: there will be 2 releases each for one ABI/API.
Michael Niedermayer [Tue, 21 Jun 2011 15:02:14 +0000 (17:02 +0200)]
release_notes: there will be 2 releases each for one ABI/API.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorelease_notes: suggest git log instead of the poorly maintained APIChanges
Michael Niedermayer [Tue, 21 Jun 2011 14:43:45 +0000 (16:43 +0200)]
release_notes: suggest git log instead of the poorly maintained APIChanges

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorelease_notes: we do support releases
Michael Niedermayer [Tue, 21 Jun 2011 14:37:11 +0000 (16:37 +0200)]
release_notes: we do support releases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild system: disable memalign on haiku, its not reliable there.
Michael Niedermayer [Tue, 21 Jun 2011 14:36:23 +0000 (16:36 +0200)]
build system: disable memalign on haiku, its not reliable there.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffprobe: remove duplicate avformat_alloc_context()
Michael Niedermayer [Tue, 21 Jun 2011 12:38:58 +0000 (14:38 +0200)]
ffprobe: remove duplicate avformat_alloc_context()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix segmentation fault in ffprobe
Gavin Kinsey [Tue, 21 Jun 2011 12:13:37 +0000 (13:13 +0100)]
Fix segmentation fault in ffprobe

8 years agowma: fix infinite loop
Michael Niedermayer [Tue, 21 Jun 2011 11:17:10 +0000 (13:17 +0200)]
wma: fix infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix H.264 4:4:4 lossless decoding.
Jason Garrett-Glaser [Tue, 21 Jun 2011 08:45:22 +0000 (10:45 +0200)]
Fix H.264 4:4:4 lossless decoding.

The coefficient test for i16x16 add_pixels4 assumed luma plane.

8 years agoswscale: undo version upgrade that git merged in and that i missed
Michael Niedermayer [Tue, 21 Jun 2011 04:26:38 +0000 (06:26 +0200)]
swscale: undo version upgrade that git merged in and that i missed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: revert ABI breaking long->int chnage that touch public ABI
Michael Niedermayer [Tue, 21 Jun 2011 03:47:44 +0000 (05:47 +0200)]
swscale: revert ABI breaking long->int chnage that touch public ABI

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge branch 'master' into oldabi
Michael Niedermayer [Tue, 21 Jun 2011 03:22:40 +0000 (05:22 +0200)]
Merge branch 'master' into oldabi

* master: (109 commits)
  libx264: fix open gop default. Please use -x264opts to force open gop This fixes Ticket268
  avfilter picture pool: double free hotfix
  mpegaudio_parser: be less picky on the start position
  ppc32: Fix movrel
  Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
  x86: cabac: fix register constraints for 32-bit mode
  cabac: move x86 asm to libavcodec/x86/cabac.h
  x86: h264: cast pointers to intptr_t rather than int
  x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
  x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
  x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
  x86: cabac: remove hardcoded esi in get_cabac_inline()
  x86: cabac: remove hardcoded edx in get_cabac_inline()
  x86: cabac: remove unused macro parameter
  x86: cabac: remove hardcoded ebx in inline asm
  x86: cabac: remove hardcoded struct offsets from inline asm
  cabac: remove inline asm under #if 0
  cabac: remove BRANCHLESS_CABAC_DECODER switch
  ...

Conflicts:
cmdutils.c
ffserver.c
libavfilter/avfilter.h
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibx264: fix open gop default.
Michael Niedermayer [Tue, 21 Jun 2011 02:45:29 +0000 (04:45 +0200)]
libx264: fix open gop default.
Please use -x264opts to force open gop
This fixes Ticket268

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavfilter picture pool: double free hotfix
Michael Niedermayer [Tue, 21 Jun 2011 02:24:03 +0000 (04:24 +0200)]
avfilter picture pool: double free hotfix

This fix introduces a small memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 21 Jun 2011 01:38:25 +0000 (03:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (28 commits)
  Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
  x86: cabac: fix register constraints for 32-bit mode
  cabac: move x86 asm to libavcodec/x86/cabac.h
  x86: h264: cast pointers to intptr_t rather than int
  x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
  x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
  x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
  x86: cabac: remove hardcoded esi in get_cabac_inline()
  x86: cabac: remove hardcoded edx in get_cabac_inline()
  x86: cabac: remove unused macro parameter
  x86: cabac: remove hardcoded ebx in inline asm
  x86: cabac: remove hardcoded struct offsets from inline asm
  cabac: remove inline asm under #if 0
  cabac: remove BRANCHLESS_CABAC_DECODER switch
  cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED
  document libswscale bump
  error_resilience: skip last-MV predictor step if MVs are not available.
  error_resilience: actually add counter when adding a MV predictor.
  ...

Conflicts:
Changelog
libavcodec/error_resilience.c
libavfilter/defaults.c
libavfilter/vf_drawtext.c
libswscale/swscale.h
tests/ref/vsynth1/error
tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegaudio_parser: be less picky on the start position
Michael Niedermayer [Tue, 21 Jun 2011 00:49:20 +0000 (02:49 +0200)]
mpegaudio_parser: be less picky on the start position

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoppc32: Fix movrel
Kim Nguyen [Mon, 20 Jun 2011 22:18:54 +0000 (00:18 +0200)]
ppc32: Fix movrel

Fixes ticket272

8 years agoReplace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
Justin Ruggles [Tue, 7 Jun 2011 17:40:22 +0000 (13:40 -0400)]
Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().

av_get_bits_per_sample_fmt() is deprecated.

8 years agox86: cabac: fix register constraints for 32-bit mode
Mans Rullgard [Mon, 20 Jun 2011 22:10:26 +0000 (23:10 +0100)]
x86: cabac: fix register constraints for 32-bit mode

Some operands need to be accessed in byte mode, which restricts the
available registers in 32-bit mode.  Using the 'q' constraint selects
a suitable register.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agocabac: move x86 asm to libavcodec/x86/cabac.h
Mans Rullgard [Mon, 20 Jun 2011 09:53:41 +0000 (10:53 +0100)]
cabac: move x86 asm to libavcodec/x86/cabac.h

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: h264: cast pointers to intptr_t rather than int
Mans Rullgard [Mon, 20 Jun 2011 09:24:26 +0000 (10:24 +0100)]
x86: h264: cast pointers to intptr_t rather than int

Only the low-order bits are used here so the type is not important,
but this avoids a compiler warning.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: h264: remove hardcoded edi in decode_significance_8x8_x86()
Mans Rullgard [Mon, 20 Jun 2011 09:20:15 +0000 (10:20 +0100)]
x86: h264: remove hardcoded edi in decode_significance_8x8_x86()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
Mans Rullgard [Mon, 20 Jun 2011 09:12:29 +0000 (10:12 +0100)]
x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
Mans Rullgard [Mon, 20 Jun 2011 09:06:07 +0000 (10:06 +0100)]
x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
Mans Rullgard [Mon, 20 Jun 2011 08:23:26 +0000 (09:23 +0100)]
x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
Mans Rullgard [Mon, 20 Jun 2011 08:28:19 +0000 (09:28 +0100)]
x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()

Nothing requires this value in %eax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: cabac: remove hardcoded esi in get_cabac_inline()
Mans Rullgard [Mon, 20 Jun 2011 08:19:27 +0000 (09:19 +0100)]
x86: cabac: remove hardcoded esi in get_cabac_inline()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: cabac: remove hardcoded edx in get_cabac_inline()
Mans Rullgard [Mon, 20 Jun 2011 02:39:45 +0000 (03:39 +0100)]
x86: cabac: remove hardcoded edx in get_cabac_inline()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: cabac: remove unused macro parameter
Mans Rullgard [Mon, 20 Jun 2011 02:19:20 +0000 (03:19 +0100)]
x86: cabac: remove unused macro parameter

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: cabac: remove hardcoded ebx in inline asm
Mans Rullgard [Mon, 20 Jun 2011 01:31:53 +0000 (02:31 +0100)]
x86: cabac: remove hardcoded ebx in inline asm

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: cabac: remove hardcoded struct offsets from inline asm
Mans Rullgard [Mon, 20 Jun 2011 00:54:32 +0000 (01:54 +0100)]
x86: cabac: remove hardcoded struct offsets from inline asm

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agocabac: remove inline asm under #if 0
Mans Rullgard [Mon, 20 Jun 2011 00:58:36 +0000 (01:58 +0100)]
cabac: remove inline asm under #if 0

A comment says it's not faster than the C code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agocabac: remove BRANCHLESS_CABAC_DECODER switch
Mans Rullgard [Mon, 20 Jun 2011 00:49:38 +0000 (01:49 +0100)]
cabac: remove BRANCHLESS_CABAC_DECODER switch

The code does not compile without this set.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agocabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED
Mans Rullgard [Sun, 19 Jun 2011 23:59:35 +0000 (00:59 +0100)]
cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoFix bink audio playback outside of FFmpeg.
Ivan Kalvachev [Thu, 16 Jun 2011 16:35:33 +0000 (19:35 +0300)]
Fix bink audio playback outside of FFmpeg.

There are 2 known Bink audio codecs. Additionally they have
a different flavor if they are found inside Bink-b "BIKb" file.
In order to guess the correct flavor, the demuxer sets the audio
codec_tag to be the same as the file format tag.
This causes problem because same tag is used for both audio codecs.
The hack works in FFmpeg because audio codecs are identified by their
codec_id, but other players rely on standard behavior.

This fix removes the codec_tag hack and instead uses artificial
extradata format to signal the codec flavor. This would also
allow proper embedding of Bink audio in other containers.

Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodocument libswscale bump
Reinhard Tartler [Mon, 20 Jun 2011 20:40:31 +0000 (22:40 +0200)]
document libswscale bump

8 years agoerror_resilience: skip last-MV predictor step if MVs are not available.
Ronald Bultje [Mon, 20 Jun 2011 15:07:56 +0000 (15:07 +0000)]
error_resilience: skip last-MV predictor step if MVs are not available.

Fixes crashes when playing broken MPEG2-TS streams.

8 years agoerror_resilience: actually add counter when adding a MV predictor.
Ronald Bultje [Mon, 20 Jun 2011 15:07:55 +0000 (15:07 +0000)]
error_resilience: actually add counter when adding a MV predictor.

Without, the predictor isn't actually used.

8 years agoqdm2: Fix alignment of local array.
Michael Niedermayer [Sat, 18 Jun 2011 00:44:17 +0000 (02:44 +0200)]
qdm2: Fix alignment of local array.

Fixes ticket270

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX
Stefano Sabatini [Thu, 21 Apr 2011 08:31:48 +0000 (10:31 +0200)]
ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX

Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agodrawtext: add braces around initialisers for option defaults
Stefano Sabatini [Mon, 16 May 2011 21:44:35 +0000 (23:44 +0200)]
drawtext: add braces around initialisers for option defaults

Fix warnings of the type:
vf_drawtext.c:NNN: warning: missing braces around initializer
vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agodrawtext: reindent after the previous commit
Stefano Sabatini [Mon, 16 May 2011 21:48:00 +0000 (23:48 +0200)]
drawtext: reindent after the previous commit

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agodrawtext: fix strftime() text expansion
Stefano Sabatini [Mon, 16 May 2011 18:11:50 +0000 (20:11 +0200)]
drawtext: fix strftime() text expansion

The feature was dropped after the filter was partially rewritten and
recommitted.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoffmpeg: print warning if encoding would duplicate massive amounts of frames
Michael Niedermayer [Mon, 20 Jun 2011 18:13:26 +0000 (20:13 +0200)]
ffmpeg: print warning if encoding would duplicate massive amounts of frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoBump major version for b8e893399ff8755721dc117695ec5ff183c1e07b
Reinhard Tartler [Mon, 20 Jun 2011 10:20:54 +0000 (12:20 +0200)]
Bump major version for b8e893399ff8755721dc117695ec5ff183c1e07b

On architectures such as x86 (both 32 bit and 64bit), the stack element
size is fixed, which maintains alignment.  Here, this change does not
break anything. However, we also support also other architectures where
this property is not maintained and therefore, applications will crash
horribly.

This change effectively forces all applications to be recompiled against
libswscale.

8 years agoh264-mt: fix deadlock in packets with multiple slices (e.g. MP4).
Ronald S. Bultje [Mon, 20 Jun 2011 14:24:33 +0000 (10:24 -0400)]
h264-mt: fix deadlock in packets with multiple slices (e.g. MP4).

8 years agocmdutils: remove outcommented merge trash
Michael Niedermayer [Mon, 20 Jun 2011 11:22:23 +0000 (13:22 +0200)]
cmdutils: remove outcommented merge trash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 20 Jun 2011 01:49:51 +0000 (03:49 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Drop git- prefix from version labels
  Use the contents of RELEASE as version fallback instead of 'UNKNOWN'
  path64/open64: filter out unsupported flags
  Add Release Notes
  sipr: Drop unused DSPContext
  sipr: include string.h for mem*()
  sipr: Use memmove() to copy overlapped buffers.
  h264: drop some ugly casts

Conflicts:
version.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomov: Fix empty edit detection.
Yusuke Nakamura [Sat, 4 Jun 2011 16:28:43 +0000 (01:28 +0900)]
mov: Fix empty edit detection.

8 years agodump_metadata: Fix 0xd in metadata
Michael Niedermayer [Sun, 19 Jun 2011 18:32:37 +0000 (20:32 +0200)]
dump_metadata: Fix 0xd in metadata

Fixed ticket245

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAttempt to fix ticket266
Michael Niedermayer [Sun, 19 Jun 2011 18:02:30 +0000 (20:02 +0200)]
Attempt to fix ticket266

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoeval: Fix 32bit unsigned parsing
Michael Niedermayer [Sun, 19 Jun 2011 15:57:51 +0000 (17:57 +0200)]
eval: Fix 32bit unsigned parsing

Fixes ticket264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavidec: consider non video to contain only keyframes when seeking.
Michael Niedermayer [Sun, 19 Jun 2011 11:09:16 +0000 (13:09 +0200)]
avidec: consider non video to contain only keyframes when seeking.

Fixes Ticket271

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffplay: dont drop frames by default when there is no audio stream
Michael Niedermayer [Sun, 19 Jun 2011 03:55:12 +0000 (05:55 +0200)]
ffplay: dont drop frames by default when there is no audio stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: add layout negotiation fields and helper functions.
Mina Nagy Zaki [Sun, 19 Jun 2011 18:31:24 +0000 (20:31 +0200)]
lavfi: add layout negotiation fields and helper functions.

8 years agolavfi: use int64_t lists in AVFilteFormats
Mina Nagy Zaki [Tue, 7 Jun 2011 18:17:23 +0000 (21:17 +0300)]
lavfi: use int64_t lists in AVFilteFormats

The list type was changed to int64_t to be able to hold
channel layouts.

avfilter_make_format_list() still takes a int32_t array and converts
it to int64_t. A new function, avfilter_make_format64_list, that
takes int64_t arrays has been added.

8 years agolavfi: fix realloc size computation in avfilter_add_format()
Stefano Sabatini [Sun, 19 Jun 2011 20:07:18 +0000 (22:07 +0200)]
lavfi: fix realloc size computation in avfilter_add_format()

Replace sizeof((*avff)->formats)
with    sizeof(*(*avff)->formats)

as the size of the array element is given by the pointed element
rather than by its pointer.

In particular fix computation with the pending patch when
sizeof(int64_t) != sizeof(int64_t *).

8 years agolavfi: fix Makefile HEADERS
Stefano Sabatini [Sun, 19 Jun 2011 20:42:09 +0000 (22:42 +0200)]
lavfi: fix Makefile HEADERS

Add a missing space between vsink_buffer.h and vsrc_buffer.h.
1000l.

8 years agoDrop git- prefix from version labels
Mans Rullgard [Sun, 19 Jun 2011 18:31:56 +0000 (19:31 +0100)]
Drop git- prefix from version labels

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoUse the contents of RELEASE as version fallback instead of 'UNKNOWN'
Reinhard Tartler [Sun, 19 Jun 2011 17:51:20 +0000 (19:51 +0200)]
Use the contents of RELEASE as version fallback instead of 'UNKNOWN'

This makes binaries produced by source tarballs identify themselves with
the version number of the corresponding release series, unless overriden
by a 'VERSION' file.

8 years agopath64/open64: filter out unsupported flags
Mans Rullgard [Sun, 19 Jun 2011 17:03:21 +0000 (18:03 +0100)]
path64/open64: filter out unsupported flags

These flags are accepted without error but produce an annoying
warning.  Filtering them out makes the build less noisy.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoAdd Release Notes
Reinhard Tartler [Sun, 19 Jun 2011 17:45:36 +0000 (19:45 +0200)]
Add Release Notes

8 years agolavfi: add vsink_buffer, and use it in ff* tools
Stefano Sabatini [Sat, 11 Jun 2011 16:43:11 +0000 (18:43 +0200)]
lavfi: add vsink_buffer, and use it in ff* tools

Also add the public interface libavfilter/vsink_buffer.h.

8 years agovsrc_color: use internal timebase
Stefano Sabatini [Fri, 17 Jun 2011 23:52:40 +0000 (01:52 +0200)]
vsrc_color: use internal timebase

Avoid timescale conversion, simplify.

8 years agoopt: do not crash in av_set_options_string() if opts == NULL
Stefano Sabatini [Sun, 19 Jun 2011 00:49:04 +0000 (02:49 +0200)]
opt: do not crash in av_set_options_string() if opts == NULL

Add missing NULL check, and update documentation accordingly.

8 years agolavfi: add negate filter
Stefano Sabatini [Sat, 28 May 2011 20:00:26 +0000 (22:00 +0200)]
lavfi: add negate filter

This filter is a simple wrapper around the LUT filter.

8 years agolavfi: add LUT (LookUp Table) generic filters
Stefano Sabatini [Sat, 28 May 2011 19:51:03 +0000 (21:51 +0200)]
lavfi: add LUT (LookUp Table) generic filters

8 years agosipr: Drop unused DSPContext
Alex Converse [Sat, 18 Jun 2011 22:45:45 +0000 (15:45 -0700)]
sipr: Drop unused DSPContext

8 years agosipr: include string.h for mem*()
Alex Converse [Sat, 18 Jun 2011 22:44:31 +0000 (15:44 -0700)]
sipr: include string.h for mem*()

8 years agosipr: Use memmove() to copy overlapped buffers.
Alex Converse [Sat, 18 Jun 2011 22:42:57 +0000 (15:42 -0700)]
sipr: Use memmove() to copy overlapped buffers.

8 years agoh264: drop some ugly casts
Alex Converse [Sat, 18 Jun 2011 05:03:24 +0000 (22:03 -0700)]
h264: drop some ugly casts

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 19 Jun 2011 02:02:06 +0000 (04:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: prevent crash in av_open_input_file() if ap == NULL.
  more Changelog additions
  lavf: add a forgotten NULL check in convert_format_parameters().
  Fix build if yasm is not available.
  H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions.

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: fix mono input for width%8
Michael Niedermayer [Sun, 19 Jun 2011 01:33:15 +0000 (03:33 +0200)]
swscale: fix mono input for width%8

Fixes ticket193

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavidec: Ignore unknown stream types
ami_stuff [Sat, 18 Jun 2011 23:47:25 +0000 (01:47 +0200)]
avidec: Ignore unknown stream types

Improves ticket131

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: print actual slice number in "Too many slices" warning
Michael Niedermayer [Sat, 18 Jun 2011 22:02:55 +0000 (00:02 +0200)]
h264: print actual slice number in "Too many slices" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agojpegdec: include mjpb_skiptosod in debug output
Michael Niedermayer [Sat, 18 Jun 2011 22:00:52 +0000 (00:00 +0200)]
jpegdec: include mjpb_skiptosod in debug output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agojpegdec: fix CJPG decoding.
Michael Niedermayer [Sat, 18 Jun 2011 21:59:27 +0000 (23:59 +0200)]
jpegdec: fix CJPG decoding.

Fixes ticket133

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agow32threads: with only 1 thread there cant be a active threading mode.
Michael Niedermayer [Sat, 18 Jun 2011 19:59:11 +0000 (21:59 +0200)]
w32threads: with only 1 thread there cant be a active threading mode.

Fixes ticket284

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: warn if samples need to be converted in a lossy way for lossless encoders.
Michael Niedermayer [Sat, 18 Jun 2011 19:54:11 +0000 (21:54 +0200)]
ffmpeg: warn if samples need to be converted in a lossy way for lossless encoders.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflacenc: mark as lossless codec
Michael Niedermayer [Sat, 18 Jun 2011 19:53:54 +0000 (21:53 +0200)]
flacenc: mark as lossless codec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavcodec: add CODEC_CAP_LOSSLESS
Michael Niedermayer [Sat, 18 Jun 2011 19:53:20 +0000 (21:53 +0200)]
libavcodec: add CODEC_CAP_LOSSLESS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf: prevent crash in av_open_input_file() if ap == NULL.
Ronald S. Bultje [Sat, 18 Jun 2011 19:33:49 +0000 (15:33 -0400)]
lavf: prevent crash in av_open_input_file() if ap == NULL.

Needed for proper behaviour in our old API compatibility code.