ffmpeg.git
9 years agoMerge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'
Michael Niedermayer [Fri, 17 Jun 2011 03:49:41 +0000 (05:49 +0200)]
Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'

* commit '9446d75941d639f19cfa9ae007eb4c5ca041f200':
  ffmpeg: merge output_codecs array into AVOutputStream members.
  rtpenc_latm: Consistently use "Libav" in license boilerplate.
  rtsp: Don't pass string pointer as format string to ff_url_join
  mmsh: fixed printf injection bug in mmsh request
  codec-regression: remove pointless -r options for dnxhd

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoDo not crash if SDL_SetVideoMode() fails.
Carl Eugen Hoyos [Thu, 16 Jun 2011 21:21:19 +0000 (23:21 +0200)]
Do not crash if SDL_SetVideoMode() fails.

9 years agoMove do_exit() and stream_close() up.
Carl Eugen Hoyos [Thu, 16 Jun 2011 21:20:29 +0000 (23:20 +0200)]
Move do_exit() and stream_close() up.

9 years agoFix documentation for -ar and -ac.
Carl Eugen Hoyos [Thu, 16 Jun 2011 21:16:58 +0000 (23:16 +0200)]
Fix documentation for -ar and -ac.

9 years agoFix compilation with old yasm.
Carl Eugen Hoyos [Thu, 16 Jun 2011 21:14:17 +0000 (23:14 +0200)]
Fix compilation with old yasm.

9 years agoffmpeg: Force 420 with target dvd and svcd.
Michael Niedermayer [Thu, 16 Jun 2011 21:06:27 +0000 (23:06 +0200)]
ffmpeg: Force 420 with target dvd and svcd.

Fixes ticket283

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agommsh: fix 400 bad request
Kirill Zorin [Thu, 16 Jun 2011 18:15:53 +0000 (20:15 +0200)]
mmsh: fix 400 bad request

There is no need to write two HTTP newlines (\r\n) into "headers",
because http_connect (in http.c) already appends one HTTP newline at
the end of the given headers chunk, which would result in sending
three HTTP newlines after the headers. Most of the time it's okay
(although not RFC-conforming), but many proxy servers and the
occasional strict httpd will puke with a "400 bad request".

9 years agoffmpeg: merge output_codecs array into AVOutputStream members.
Anton Khirnov [Thu, 16 Jun 2011 16:04:56 +0000 (18:04 +0200)]
ffmpeg: merge output_codecs array into AVOutputStream members.

There's no point in keeping them separate.

9 years agortpenc_latm: Consistently use "Libav" in license boilerplate.
Diego Biurrun [Thu, 16 Jun 2011 15:04:06 +0000 (17:04 +0200)]
rtpenc_latm: Consistently use "Libav" in license boilerplate.

9 years agortsp: Don't pass string pointer as format string to ff_url_join
Martin Storsjö [Thu, 16 Jun 2011 08:04:27 +0000 (11:04 +0300)]
rtsp: Don't pass string pointer as format string to ff_url_join

In this case, the string that was passed couldn't contain
user-defined data and thus there was no risk for injection
bugs, but it's safer this way, if we later change the
content of the options string.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agommsh: fixed printf injection bug in mmsh request
Kirill Zorin [Wed, 15 Jun 2011 17:18:29 +0000 (19:18 +0200)]
mmsh: fixed printf injection bug in mmsh request

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agocodec-regression: remove pointless -r options for dnxhd
Anton Khirnov [Thu, 16 Jun 2011 05:24:14 +0000 (07:24 +0200)]
codec-regression: remove pointless -r options for dnxhd

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 16 Jun 2011 01:53:58 +0000 (03:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ac3enc: use correct alignment and length in channel coupling dsp functions.
  ffmpeg: don't abuse a global for passing framerate from input to output
  ffmpeg: don't abuse a global for passing channels from input to output
  ffmpeg: don't abuse a global for passing samplerate from input to output
  ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes
  swscale: use SwsContext for av_log when available
  swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.
  swscale: Fix compilation with --disable-mmx2.

Conflicts:
ffmpeg.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agommsh: fixed printf injection bug in mmsh request
Kirill Zorin [Wed, 15 Jun 2011 17:18:29 +0000 (19:18 +0200)]
mmsh: fixed printf injection bug in mmsh request

9 years agoac3enc: use correct alignment and length in channel coupling dsp functions.
Justin Ruggles [Tue, 14 Jun 2011 17:45:38 +0000 (13:45 -0400)]
ac3enc: use correct alignment and length in channel coupling dsp functions.

This fixes a segfault when using the C version of ac3dsp.float_to_fixed24().

9 years agoffmpeg: don't abuse a global for passing framerate from input to output
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing framerate from input to output

It's broken with multiple files or video streams.

9 years agoffmpeg: don't abuse a global for passing channels from input to output
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing channels from input to output

It's broken with multiple files or audio streams.

9 years agoffmpeg: don't abuse a global for passing samplerate from input to output
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing samplerate from input to output

It's broken with multiple files or audio streams.

This removes the default samplerate of 44100 for raw input, hence all
the FATE changes.

9 years agoMake buffer size check consistent and avoid a possible overflow.
Reimar Döffinger [Wed, 15 Jun 2011 18:21:33 +0000 (20:21 +0200)]
Make buffer size check consistent and avoid a possible overflow.

9 years agoFix spelling.
Reimar Döffinger [Wed, 15 Jun 2011 18:20:47 +0000 (20:20 +0200)]
Fix spelling.

9 years agoFull support for sending H.264 in RTP
Luca Abeni [Wed, 15 Jun 2011 15:59:03 +0000 (17:59 +0200)]
Full support for sending H.264 in RTP

This implements support for the "MP4" syntax of H.264 bitstreams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoARM: update ff_h264_idct8_add4_neon for 4:4:4 changes
Mans Rullgard [Wed, 15 Jun 2011 11:58:00 +0000 (12:58 +0100)]
ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoswscale: use SwsContext for av_log when available
Janne Grunau [Mon, 25 Apr 2011 22:27:48 +0000 (00:27 +0200)]
swscale: use SwsContext for av_log when available

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agoSupport reading chan atoms with empty channel descriptions.
Andrew Wason [Wed, 15 Jun 2011 09:09:17 +0000 (11:09 +0200)]
Support reading chan atoms with empty channel descriptions.

Fixes ticket 263.

9 years agoReindent after last commit.
Carl Eugen Hoyos [Wed, 15 Jun 2011 08:58:25 +0000 (10:58 +0200)]
Reindent after last commit.

9 years agoFix multi-channel AAC encoding.
Carl Eugen Hoyos [Wed, 15 Jun 2011 08:57:26 +0000 (10:57 +0200)]
Fix multi-channel AAC encoding.

Fixes ticket 55.

9 years agoFix "redundant redeclaration" warning.
Carl Eugen Hoyos [Wed, 15 Jun 2011 08:53:18 +0000 (10:53 +0200)]
Fix "redundant redeclaration" warning.

9 years agoFix compilation with --disable-everything --enable-encoder=ac3/ac3_fixed.
Carl Eugen Hoyos [Wed, 15 Jun 2011 08:47:46 +0000 (10:47 +0200)]
Fix compilation with --disable-everything --enable-encoder=ac3/ac3_fixed.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 15 Jun 2011 00:15:25 +0000 (02:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: remove misplaced comment.
  ffmpeg: fix streaming to ffserver.
  swscale: split out RGB48 output functions from yuv2packed[12X]_c().
  build: move vpath directives to main Makefile
  swscale: fix JPEG-range YUV scaling artifacts.
  build: move ALLFFLIBS to a more logical place
  ARM: factor some repetitive code into macros
  Fix SVQ3 after adding 4:4:4 H.264 support
  H.264: fix CODEC_FLAG_GRAY
  4:4:4 H.264 decoding support
  ac3enc: fix allocation of floating point samples.

Conflicts:
ffmpeg.c
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/snow.c
libswscale/swscale.c
libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_mp: Fix large memleak.
Michael Niedermayer [Tue, 14 Jun 2011 23:36:12 +0000 (01:36 +0200)]
vf_mp: Fix large memleak.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.
Diego Biurrun [Tue, 14 Jun 2011 22:56:31 +0000 (00:56 +0200)]
swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.

9 years agoswscale: Fix compilation with --disable-mmx2.
Diego Biurrun [Tue, 14 Jun 2011 22:52:43 +0000 (00:52 +0200)]
swscale: Fix compilation with --disable-mmx2.

Some MMX2 functions were being referenced without proper #ifdefs.

9 years agomjpegenc: Fix JFIF version
William Yu [Tue, 14 Jun 2011 15:16:51 +0000 (17:16 +0200)]
mjpegenc: Fix JFIF version

9 years agoswscale: remove misplaced comment.
Ronald S. Bultje [Tue, 14 Jun 2011 20:55:24 +0000 (16:55 -0400)]
swscale: remove misplaced comment.

The comment should have been placed only in
yuv2rgb48_X_c_template, not yuv2rgb48_1_c_template.

9 years agoffmpeg: fix streaming to ffserver.
Ronald S. Bultje [Tue, 14 Jun 2011 19:35:05 +0000 (15:35 -0400)]
ffmpeg: fix streaming to ffserver.

9 years agoswscale: split out RGB48 output functions from yuv2packed[12X]_c().
Ronald S. Bultje [Tue, 14 Jun 2011 19:02:24 +0000 (15:02 -0400)]
swscale: split out RGB48 output functions from yuv2packed[12X]_c().

This is part of the Great Evil Plan to simplify swscale. Note that
you'll see some code duplication between the output functions for
different RGB variants, and even between packed-YUV and RGB
variants. This is intentional because it improves readability.

9 years agobuild: move vpath directives to main Makefile
Mans Rullgard [Sun, 5 Jun 2011 21:00:54 +0000 (22:00 +0100)]
build: move vpath directives to main Makefile

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoswscale: fix JPEG-range YUV scaling artifacts.
Michael Niedermayer [Mon, 13 Jun 2011 01:53:22 +0000 (21:53 -0400)]
swscale: fix JPEG-range YUV scaling artifacts.

YUV planes were marked as uint16_t, but they contained signed data.
Fixes issue 1108 and 675.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agobuild: move ALLFFLIBS to a more logical place
Mans Rullgard [Sun, 5 Jun 2011 21:18:06 +0000 (22:18 +0100)]
build: move ALLFFLIBS to a more logical place

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoARM: factor some repetitive code into macros
Mans Rullgard [Sun, 12 Jun 2011 23:33:19 +0000 (00:33 +0100)]
ARM: factor some repetitive code into macros

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoCrystalHD: Use mp4toannexb bitstream filter.
Philip Langdale [Mon, 13 Jun 2011 03:22:20 +0000 (20:22 -0700)]
CrystalHD: Use mp4toannexb bitstream filter.

The H.264 parser that we use to detect interlacing can only handle
an Annex B stream, so we need to actually use the filter. This is
unfortunate as the crystalhd library is already doing this conversion
internally. A future change will reorganise the decode path more
completely so that we can feed the converted stream into libcrystalhd
and avoid the second conversion.

Signed-off-by: Philip Langdale <philipl@overt.org>
9 years agoCrystalHD: Keep mp4toannexb filter around for entire decoder lifetime.
Philip Langdale [Mon, 13 Jun 2011 03:21:28 +0000 (20:21 -0700)]
CrystalHD: Keep mp4toannexb filter around for entire decoder lifetime.

In preparation for using the filter on the actual bitstream, we need
to extend it's lifetime to match that of the decoder.

Signed-off-by: Philip Langdale <philipl@overt.org>
9 years agoFix SVQ3 after adding 4:4:4 H.264 support
Jason Garrett-Glaser [Mon, 13 Jun 2011 17:21:46 +0000 (10:21 -0700)]
Fix SVQ3 after adding 4:4:4 H.264 support

9 years agoH.264: fix CODEC_FLAG_GRAY
Jason Garrett-Glaser [Thu, 9 Jun 2011 23:17:41 +0000 (16:17 -0700)]
H.264: fix CODEC_FLAG_GRAY

It was broken in 4:4:4, and still did chroma deblocking for no reason in 4:2:0.

9 years ago4:4:4 H.264 decoding support
Jason Garrett-Glaser [Fri, 3 Jun 2011 08:12:28 +0000 (01:12 -0700)]
4:4:4 H.264 decoding support

Note: this is 4:4:4 from the 2007 spec revision, not the previous (now deprecated) 4:4:4 mode in H.264.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 14 Jun 2011 02:55:27 +0000 (04:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (24 commits)
  utils: Drop pointless '#if 1' preprocessor directive.
  ac3enc: remove empty ac3_float function that is never called
  ac3enc: split templated float vs. fixed functions into a separate file.
  ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct
  ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output functions.
  Roll back 4:4:4 H.264 for now Needs some ARM/PPC asm modifications.
  Fix SVQ3 after adding 4:4:4 H.264 support
  H.264: fix CODEC_FLAG_GRAY
  4:4:4 H.264 decoding support
  h264_parser: Fix whitespace after previous change.
  h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set.
  wav: remove an invalid free().
  lavf: initialise reference_dts in av_estimate_timings_from_pts.
  h264: don't be so picky on decoding pps in extradata.
  avcodec.h: add or elaborate on some documentation comments.
  h264: change a few comments into error messages
  ac3dec: fix doxy-style for comment ("///>" should be "///<" instead).
  img2: add .dpx to the list of supported file extensions.
  ffv1: fix undefined behavior with insane widths.
  ARM: jrevdct_arm: simplify stack usage
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomatroskadec: properly decode color space in an endian neutral way
Aurelien Jacobs [Tue, 14 Jun 2011 00:00:06 +0000 (02:00 +0200)]
matroskadec: properly decode color space in an endian neutral way

9 years agomatroskadec: use a temporary fourcc variable
Aurelien Jacobs [Mon, 13 Jun 2011 23:58:11 +0000 (01:58 +0200)]
matroskadec: use a temporary fourcc variable

9 years agomatroskaenc: ensure the written colorspace don't depend on host endianness
Aurelien Jacobs [Mon, 13 Jun 2011 23:53:40 +0000 (01:53 +0200)]
matroskaenc: ensure the written colorspace don't depend on host endianness

9 years agoac3enc: fix allocation of floating point samples.
Justin Ruggles [Mon, 13 Jun 2011 21:44:50 +0000 (17:44 -0400)]
ac3enc: fix allocation of floating point samples.

sizeof(SampleType) is different for fixed and float encoders.

9 years agoutils: Drop pointless '#if 1' preprocessor directive.
Diego Biurrun [Fri, 10 Jun 2011 18:27:50 +0000 (20:27 +0200)]
utils: Drop pointless '#if 1' preprocessor directive.

9 years agoac3enc: remove empty ac3_float function that is never called
Justin Ruggles [Fri, 10 Jun 2011 19:17:55 +0000 (15:17 -0400)]
ac3enc: remove empty ac3_float function that is never called

9 years agoac3enc: split templated float vs. fixed functions into a separate file.
Justin Ruggles [Fri, 10 Jun 2011 18:57:19 +0000 (14:57 -0400)]
ac3enc: split templated float vs. fixed functions into a separate file.

Function pointers are used for templated functions instead of needlessly
duplicating many functions.

9 years agoac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct
Justin Ruggles [Fri, 10 Jun 2011 16:42:36 +0000 (12:42 -0400)]
ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct

This will allow the same struct to be used for both the fixed and float ac3
encoders.

9 years agoac3enc: use function pointer to choose between AC-3 and E-AC-3 header output
Justin Ruggles [Fri, 10 Jun 2011 15:45:03 +0000 (11:45 -0400)]
ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output
functions.

9 years agoRoll back 4:4:4 H.264 for now
Jason Garrett-Glaser [Mon, 13 Jun 2011 20:38:46 +0000 (13:38 -0700)]
Roll back 4:4:4 H.264 for now
Needs some ARM/PPC asm modifications.

9 years agoFix SVQ3 after adding 4:4:4 H.264 support
Jason Garrett-Glaser [Mon, 13 Jun 2011 17:21:46 +0000 (10:21 -0700)]
Fix SVQ3 after adding 4:4:4 H.264 support

9 years agoH.264: fix CODEC_FLAG_GRAY
Jason Garrett-Glaser [Thu, 9 Jun 2011 23:17:41 +0000 (16:17 -0700)]
H.264: fix CODEC_FLAG_GRAY

It was broken in 4:4:4, and still did chroma deblocking for no reason in 4:2:0.

9 years ago4:4:4 H.264 decoding support
Jason Garrett-Glaser [Fri, 3 Jun 2011 08:12:28 +0000 (01:12 -0700)]
4:4:4 H.264 decoding support

Note: this is 4:4:4 from the 2007 spec revision, not the previous (now deprecated) 4:4:4 mode in H.264.

9 years agoh264_parser: Fix whitespace after previous change.
Philip Langdale [Tue, 29 Mar 2011 04:43:23 +0000 (21:43 -0700)]
h264_parser: Fix whitespace after previous change.

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoh264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set.
Philip Langdale [Tue, 29 Mar 2011 04:42:02 +0000 (21:42 -0700)]
h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set.

Currently, the parser is buggy and only processes the stream extradata
when the flag is set. This fixes it to actually inspect the frames.

Whitespce will be fixed in a separate change.

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agowav: remove an invalid free().
Carl Eugen Hoyos [Sun, 3 Apr 2011 20:45:16 +0000 (22:45 +0200)]
wav: remove an invalid free().

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavf: initialise reference_dts in av_estimate_timings_from_pts.
Michael Niedermayer [Tue, 8 Mar 2011 21:39:14 +0000 (22:39 +0100)]
lavf: initialise reference_dts in av_estimate_timings_from_pts.

Fixes issue2437.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoh264: don't be so picky on decoding pps in extradata.
Michael Niedermayer [Tue, 1 Mar 2011 14:59:00 +0000 (15:59 +0100)]
h264: don't be so picky on decoding pps in extradata.

Fixes issue2517

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoavcodec.h: add or elaborate on some documentation comments.
Wim Lewis [Sat, 2 Apr 2011 22:30:24 +0000 (15:30 -0700)]
avcodec.h: add or elaborate on some documentation comments.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoh264: change a few comments into error messages
Michael Niedermayer [Sat, 2 Apr 2011 15:57:53 +0000 (17:57 +0200)]
h264: change a few comments into error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoac3dec: fix doxy-style for comment ("///>" should be "///<" instead).
Reimar Döffinger [Fri, 1 Apr 2011 17:42:31 +0000 (19:42 +0200)]
ac3dec: fix doxy-style for comment ("///>" should be "///<" instead).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoimg2: add .dpx to the list of supported file extensions.
Peter Ross [Fri, 1 Apr 2011 12:11:24 +0000 (23:11 +1100)]
img2: add .dpx to the list of supported file extensions.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoffv1: fix undefined behavior with insane widths.
Michael Niedermayer [Fri, 1 Apr 2011 10:46:36 +0000 (12:46 +0200)]
ffv1: fix undefined behavior with insane widths.

The new tables is large enough to prevent this together with our image size checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoreplace remaining usage of deprecated av_metadata_set2() by av_dict_set()
Aurelien Jacobs [Mon, 13 Jun 2011 17:02:50 +0000 (19:02 +0200)]
replace remaining usage of deprecated av_metadata_set2() by av_dict_set()

9 years agomatroskaenc: write colourspace element for rawvideo tracks
Aurelien Jacobs [Mon, 13 Jun 2011 16:37:32 +0000 (18:37 +0200)]
matroskaenc: write colourspace element for rawvideo tracks

9 years agonsv: simplify probe function
Aurelien Jacobs [Mon, 13 Jun 2011 16:30:55 +0000 (18:30 +0200)]
nsv: simplify probe function

9 years agonsv: return error code instead of discarding it in read_header()
Aurelien Jacobs [Mon, 13 Jun 2011 16:28:54 +0000 (18:28 +0200)]
nsv: return error code instead of discarding it in read_header()

9 years agoARM: jrevdct_arm: simplify stack usage
Mans Rullgard [Mon, 13 Jun 2011 08:33:20 +0000 (09:33 +0100)]
ARM: jrevdct_arm: simplify stack usage

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoARM: jrevdct_arm: use push/pop mnemonics
Mans Rullgard [Mon, 13 Jun 2011 08:30:42 +0000 (09:30 +0100)]
ARM: jrevdct_arm: use push/pop mnemonics

Use push/pop instead of stmdb/ldmia for stack operations.  This
is the preferred syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoARM: jrevdct_arm: misc cleanup
Mans Rullgard [Mon, 13 Jun 2011 08:24:27 +0000 (09:24 +0100)]
ARM: jrevdct_arm: misc cleanup

- use 'const' macro to define coeff table
- add missing endfunc
- remove superflous directives

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoARM: optimised mpadsp_apply_window_fixed
Mans Rullgard [Sat, 11 Jun 2011 21:53:32 +0000 (22:53 +0100)]
ARM: optimised mpadsp_apply_window_fixed

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoAdd some (important) changelog entries
Reinhard Tartler [Mon, 13 Jun 2011 06:56:54 +0000 (08:56 +0200)]
Add some (important) changelog entries

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 13 Jun 2011 02:25:36 +0000 (04:25 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: add missing NULL check in parse_options()
  x11grab: remove a memory allocation and the associated memcpy.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoH264: Reduce pointless diffs to qatar
Michael Niedermayer [Mon, 13 Jun 2011 01:30:56 +0000 (03:30 +0200)]
H264: Reduce pointless diffs to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "H264: Split out hl_motion and template it, this seems a bit faster"
Michael Niedermayer [Mon, 13 Jun 2011 01:00:53 +0000 (03:00 +0200)]
Revert "H264: Split out hl_motion and template it, this seems a bit faster"

This reverts commit a50f0bea25a3da605cd547fe3bdfd36c8764b847.

This has been implemented differently in qatar and its better they
maintain it for me instead of me having to spend an average 5sec more
per merge

Conflicts:

libavcodec/h264.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavfilter: implement avfilter_fill_frame_from_video_buffer_ref()
Stefano Sabatini [Sat, 11 Jun 2011 16:21:53 +0000 (18:21 +0200)]
libavfilter: implement avfilter_fill_frame_from_video_buffer_ref()

9 years agoavfiltergraph: make the AVFilterInOut alloc/free API public
Stefano Sabatini [Sat, 11 Jun 2011 13:30:46 +0000 (15:30 +0200)]
avfiltergraph: make the AVFilterInOut alloc/free API public

This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.

9 years agoavfiltergraph: change the syntax of avfilter_graph_parse()
Stefano Sabatini [Sat, 11 Jun 2011 13:16:02 +0000 (15:16 +0200)]
avfiltergraph: change the syntax of avfilter_graph_parse()

Make it returns the list of open inputs and outputs, so it can be
reused by applications.

Breaks API/ABI.

9 years agographparser: prefer void * over AVClass * for log contexts
Stefano Sabatini [Sat, 11 Jun 2011 12:33:09 +0000 (14:33 +0200)]
graphparser: prefer void * over AVClass * for log contexts

9 years agoh264: Complexify frame num gap shortening code
Alexander Strange [Thu, 2 Jun 2011 08:39:56 +0000 (01:39 -0700)]
h264: Complexify frame num gap shortening code

By observation it did not seem to handle prev_frame_num > frame_num.
This does not affect any files I have.
(cherry picked from commit 43c0092a80f8212cbb783260bafa157f7b85126e)

9 years agoUpdate todo
Alexander Strange [Thu, 2 Jun 2011 08:41:38 +0000 (01:41 -0700)]
Update todo

All the known bugs in h264 are fixed so I'm calling it done.
(cherry picked from commit 9cec36a6845c17e90a8d0c2cf9b03a00987c31f0)

9 years agompeg12: replace 2 asserts by av_assert0
Michael Niedermayer [Sun, 12 Jun 2011 15:59:23 +0000 (17:59 +0200)]
mpeg12: replace 2 asserts by av_assert0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocmdutils: add missing NULL check in parse_options()
Stefano Sabatini [Sun, 12 Jun 2011 11:54:22 +0000 (13:54 +0200)]
cmdutils: add missing NULL check in parse_options()

Fix ffplay -i FILE, which was recently broken.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agox11grab: remove a memory allocation and the associated memcpy.
Sven C. Dack [Wed, 30 Mar 2011 15:02:29 +0000 (17:02 +0200)]
x11grab: remove a memory allocation and the associated memcpy.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 12 Jun 2011 01:26:38 +0000 (03:26 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix "make install" with documentation disabled
  build: simplify some conditional targets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix --disable-everything
Michael Niedermayer [Sat, 11 Jun 2011 11:40:46 +0000 (13:40 +0200)]
Fix --disable-everything

Breakage was due to ff_find_pix_fmt() usage.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobuild: fix "make install" with documentation disabled
Mans Rullgard [Sat, 11 Jun 2011 18:54:23 +0000 (19:54 +0100)]
build: fix "make install" with documentation disabled

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agobuild: simplify some conditional targets
Mans Rullgard [Tue, 7 Jun 2011 09:11:21 +0000 (10:11 +0100)]
build: simplify some conditional targets

Use intermediate targets instead of variables for conditional
parts of "all" and "install" targets.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoresample: clarify supported resampling.
Clément Bœsch [Wed, 8 Jun 2011 09:26:43 +0000 (11:26 +0200)]
resample: clarify supported resampling.

This also fix a crash on 8ch → 2ch requested resampling.

9 years agolavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
Stefano Sabatini [Sat, 11 Jun 2011 09:41:49 +0000 (11:41 +0200)]
lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

Require "void *" rather than "AVClass *" for the log context type.

9 years agoavfiltergraph: use meaningful error codes
Stefano Sabatini [Sat, 11 Jun 2011 09:15:40 +0000 (11:15 +0200)]
avfiltergraph: use meaningful error codes

9 years agoRevert "ac3: there was no libav in 2010 thus this code cannot be from libav."
Michael Niedermayer [Sat, 11 Jun 2011 02:18:00 +0000 (04:18 +0200)]
Revert "ac3: there was no libav in 2010 thus this code cannot be from  libav."

This reverts commit 7b8ec38d28cc99c4017471c6981fc1206732b468.

The copyright date was wrong.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 11 Jun 2011 01:51:36 +0000 (03:51 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  bitstream: Properly promote av_reverse values before shifting.
  libavutil/swscale: YUV444P10/YUV444P9 support.
  H.264: Fix high bit depth explicit biweight
  h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
  Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
  Update copyright year for ac3enc_opts_template.c.
  adts: Adjust frame size mask to follow the specification.
  movenc: Add RTP muxer/hinter options
  movenc: Pass the RTP AVFormatContext to the SDP generation
  rtspenc: Add RTP muxer options
  rtspenc: Add an AVClass for setting muxer specific options
  rtpenc_chain: Pass the rtpflags options through to the chained muxer
  rtpenc: Declare the rtp flags private AVOptions in rtpenc.h
  sdp: Reindent after the previous commit
  rtpenc: MP4A-LATM payload support
  avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
  sdp: Allow passing an AVFormatContext to the SDP generation
  mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry.
  mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.
  swscale: split YUYV output out of yuv2packed[12X]_c().

Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/h264dsp_template.c
libavcodec/mpeg12.c
libavformat/aacdec.c
libavformat/avidec.c
libavformat/internal.h
libavformat/movenc.c
libavformat/rtpenc.c
libavformat/rtpenc_latm.c
libavformat/sdp.c
libavformat/version.h
libavutil/avutil.h
libavutil/pixfmt.h
libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix -t option for formats which holds dts and no pts
Etienne Buira [Fri, 10 Jun 2011 22:04:40 +0000 (00:04 +0200)]
Fix -t option for formats which holds dts and no pts

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