ffmpeg.git
8 years agoRevert "CrystalHD: Refine heuristic logic."
Philip Langdale [Sat, 26 Mar 2011 23:04:36 +0000 (16:04 -0700)]
Revert "CrystalHD: Refine heuristic logic."

This reverts commit f968ef922d5b1e1ba29145bceaa0278ece4f88e0.

8 years agoCrystalHD: Refine heuristic logic.
Philip Langdale [Sun, 20 Mar 2011 23:29:04 +0000 (16:29 -0700)]
CrystalHD: Refine heuristic logic.

8 years agoCrystalHD: Add heuristics to try and distinguish h.264 PAFF variants.
Philip Langdale [Thu, 17 Mar 2011 05:27:51 +0000 (22:27 -0700)]
CrystalHD: Add heuristics to try and distinguish h.264 PAFF variants.

As previously discussed, the CrystalHD hardware treats some PAFF
clips different from others; even when input fields are always in
separate packets, the hardware might return a single fieldpair for
one clip and individual fields for another.

Given the bogus flags set by the hardware, it is impossible to
distinguish these two cases without knowing about the current
picture and the next one. The hardware can usually provide the
picture number of the next picture and when that is available,
we can detect the two cases.

When it is not available, we have to guess - and find out later
if we were right or wrong.

With this change, clips will play correctly unless they are PAFF
where individual fields are returned *and* no next picture number
is available. Generally speaking, the incorrect cases arise in
the first couple of seconds of a clip as the delay calibration takes
place. Once that's set, things work fine.

8 years agoCrystalHD: Improve interlaced h.264 support.
Philip Langdale [Tue, 15 Mar 2011 04:47:35 +0000 (21:47 -0700)]
CrystalHD: Improve interlaced h.264 support.

As previously discussed, the CrystalHD hardware returns exceptionally
useless information about interlaced h.264 content - to the extent
that it's not possible to distinguish MBAFF and PAFF content until
it's too late.

This change introduces use of the h264_parser to help bridge the
gap; it can indicate if the input data is PAFF fields or not.

With this clarity, some of heuristics can be removed from the code,
making this less convoluted.

Finally, I found an MBAFF clip that acts like non h.264 content so
I had to make allowances for that.

Note that I still cannot distinguish between two forms of PAFF,
where the hardware either returns individual fields or a field-pair.
It's not clear that there's even a spec relevant difference between
the two forms, as opposed to hardware ideosyncracies.

8 years agoUse strtoul to parse rtptime and seq values.
Ilya [Sat, 26 Mar 2011 16:13:36 +0000 (17:13 +0100)]
Use strtoul to parse rtptime and seq values.

strtol could return negative values, leading to various error messages,
mainly "non-monotonically increasing dts".

8 years agoALSA: implement channel layout for playback.
Nicolas George [Thu, 10 Mar 2011 11:10:34 +0000 (12:10 +0100)]
ALSA: implement channel layout for playback.

Currently, only S16 quad, 5.1 and 7.1 are implemented.
Implementing support for other formats/layouts and capture should be
straightforward.

7.1 support by Carl Eugen Hoyos.

8 years agoffprobe: provide format parameters to av_open_input_file()
Stefano Sabatini [Thu, 24 Mar 2011 13:39:23 +0000 (14:39 +0100)]
ffprobe: provide format parameters to av_open_input_file()

Provide a non-NULL AVFormatParameters structure to
av_open_input_file() in open_input_file().

This is required because otherwise av_open_input_file() will allocate
and use a new format context, discarding the options set in the
provided format context.

8 years agolavf: make compute_pkt_fields2() return meaningful error values
Stefano Sabatini [Tue, 15 Mar 2011 11:34:55 +0000 (12:34 +0100)]
lavf: make compute_pkt_fields2() return meaningful error values

8 years agocmdutils: remove list_fmts(), simplify
Stefano Sabatini [Sat, 12 Mar 2011 11:44:22 +0000 (12:44 +0100)]
cmdutils: remove list_fmts(), simplify

The function was only used in opt_sample_fmt() for listing the sample
formats. Move list_fmts() functionality directly into
opt_sample_fmt().

Als fix the warning:
ffmpeg.c: In function ‘opt_audio_sample_fmt’:
ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type
cmdutils.h:163: note: expected ‘void (*)(char *, int,  int)’ but argument is of type ‘char * (*)(char *, int,  enum AVSampleFormat)’

8 years agoDPX decode: add buffer size checks.
Reimar Döffinger [Fri, 25 Mar 2011 17:58:07 +0000 (18:58 +0100)]
DPX decode: add buffer size checks.

8 years agonut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
Peter Ross [Sat, 19 Mar 2011 13:25:18 +0000 (00:25 +1100)]
nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE

8 years agorawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
Peter Ross [Sat, 19 Mar 2011 13:24:24 +0000 (00:24 +1100)]
rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE

8 years agoMake the hflip filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
Peter Ross [Sat, 19 Mar 2011 11:11:03 +0000 (22:11 +1100)]
Make the hflip filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

8 years agoMake the crop filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
Peter Ross [Sat, 19 Mar 2011 11:05:53 +0000 (22:05 +1100)]
Make the crop filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

8 years agolibswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation
Peter Ross [Thu, 17 Mar 2011 10:07:18 +0000 (21:07 +1100)]
libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation

8 years agoMerge remote-tracking branch 'newdev/master'
Michael Niedermayer [Sat, 26 Mar 2011 01:42:40 +0000 (02:42 +0100)]
Merge remote-tracking branch 'newdev/master'

* newdev/master:
  mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
  Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
  Use audio_service_type to set stream disposition.
  Add APIchanges entry for audio_service_type.
  Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
  configure: in check_ld, place new -l flags before existing ones
  support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
  doc: update build system documentation
  aacenc: indentation
  aacenc: fix the side calculation in search_for_ms
  vp8.c: rename EDGE_* to VP8_EDGE_*.

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vp8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
Justin Ruggles [Thu, 24 Mar 2011 16:42:05 +0000 (12:42 -0400)]
mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.

8 years agoGet audio_service_type for AC-3 based on bitstream mode in the AC-3 parser
Justin Ruggles [Thu, 24 Mar 2011 16:10:38 +0000 (12:10 -0400)]
Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser
and decoder, and vice-versa for the AC-3 encoder.

8 years agoUse audio_service_type to set stream disposition.
Justin Ruggles [Thu, 24 Mar 2011 16:09:02 +0000 (12:09 -0400)]
Use audio_service_type to set stream disposition.

8 years agoAdd APIchanges entry for audio_service_type.
Justin Ruggles [Thu, 24 Mar 2011 16:08:13 +0000 (12:08 -0400)]
Add APIchanges entry for audio_service_type.

8 years agoAdd audio_service_type field to AVCodecContext for encoding and reporting
Justin Ruggles [Thu, 24 Mar 2011 16:00:21 +0000 (12:00 -0400)]
Add audio_service_type field to AVCodecContext for encoding and reporting
of the service type in the audio bitstream.

8 years agoconfigure: in check_ld, place new -l flags before existing ones
Mans Rullgard [Fri, 25 Mar 2011 19:26:10 +0000 (19:26 +0000)]
configure: in check_ld, place new -l flags before existing ones

This fixes some library tests when --as-needed is in effect.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoUpdate to latest MPlayer version.
Reimar Döffinger [Thu, 24 Mar 2011 20:23:15 +0000 (21:23 +0100)]
Update to latest MPlayer version.

Avoids warnings due to pointlessly casting away const.

8 years agolavc: Bump micro for dvd subtitle cb/cr fix Signed-off-by: Michael Niedermayer <micha...
Michael Niedermayer [Fri, 25 Mar 2011 17:41:39 +0000 (18:41 +0100)]
lavc: Bump micro for dvd subtitle cb/cr fix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8 years agoFix incorrect colors when decoding Blu-ray subtitles
Alexandre Colucci [Fri, 25 Mar 2011 16:31:28 +0000 (17:31 +0100)]
Fix incorrect colors when decoding Blu-ray subtitles

On Blu-ray colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications:
see System Description Blu-ray Disc Read-Only Format, 9.14.4.2.2.1 Palette Definition Segment

When decoding a Blu-ray subtitle, the colors were incorrectly set.

8 years agoFix incorrect colors when decoding DVD subtitles
Alexandre Colucci [Fri, 25 Mar 2011 10:25:02 +0000 (11:25 +0100)]
Fix incorrect colors when decoding DVD subtitles

On DVD and HD-DVD colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications:
see DVD Specifications for Read-Only Disc / Part 3, 4.3 Program Chain Information (7) PGC_SP_PLT
see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (11) PGC_SDSP_PLT
see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (12) PGC_HDSP_PLT
see DVD Specifications for High Definition Disc, 5.5 Presentation Data (4) SET_COLOR2

When decoding a DVD or HD-DVD subtitle, the colors were incorrectly set.

8 years agoconfigure: sort filter deps entries
Stefano Sabatini [Fri, 25 Mar 2011 17:49:24 +0000 (18:49 +0100)]
configure: sort filter deps entries

8 years agoconfigure: update ffmpeg-user mailing-list address
Stefano Sabatini [Fri, 25 Mar 2011 17:47:22 +0000 (18:47 +0100)]
configure: update ffmpeg-user mailing-list address

The address recently changed from ffmpeg-user@mplayerhq.hu to
ffmpeg-user@ffmpeg.org.

8 years agoffmpeg: include conditionally the sws_flags variable
Stefano Sabatini [Fri, 25 Mar 2011 17:42:51 +0000 (18:42 +0100)]
ffmpeg: include conditionally the sws_flags variable

The variable is not used when libavfilter is enabled.
Fix the warning:
ffmpeg.c: At top level:
ffmpeg.c:242: warning: ‘sws_flags’ defined but not used

8 years agosupport @heading, @subheading, @subsubheading, and @subsubsection in
Justin Ruggles [Thu, 24 Mar 2011 22:39:19 +0000 (18:39 -0400)]
support @heading, @subheading, @subsubheading, and @subsubsection in
texi2pod.pl

8 years agoRevert "matroskadec: set default duration for simple block"
Michael Niedermayer [Fri, 25 Mar 2011 11:00:17 +0000 (12:00 +0100)]
Revert "matroskadec: set default duration for simple block"

This reverts commit 98a7d560b4f835ba5b99b9974ee1a2c096198bea.
This has been implemented differently by aurel already

8 years agodoc: update build system documentation
Luca Barbato [Mon, 21 Mar 2011 23:20:56 +0000 (00:20 +0100)]
doc: update build system documentation

Split normal build system documentation and the fate one.

Document THREADS make variable and provide an introduction to fate.
Document DESTDIR make variable and add some generic targets.

8 years agoaacenc: indentation
Young Han Lee [Fri, 25 Mar 2011 03:17:48 +0000 (12:17 +0900)]
aacenc: indentation

8 years agoaacenc: fix the side calculation in search_for_ms
Young Han Lee [Thu, 24 Mar 2011 01:49:36 +0000 (10:49 +0900)]
aacenc: fix the side calculation in search_for_ms

8 years agoMerge remote-tracking branch 'newdev/master'
Michael Niedermayer [Fri, 25 Mar 2011 01:57:24 +0000 (02:57 +0100)]
Merge remote-tracking branch 'newdev/master'

* newdev/master:
  matroskadec: set default duration for simple block
  When building for MinGW32 disable strict ANSI compliancy.
  ARM: fix ff_apply_window_int16_neon() prototype
  configure: check for --as-needed support early
  ARM: NEON optimised apply_window_int16()
  ac3enc: NEON optimised shift functions
  ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
  mpeg12.c: fix slice threading for mpeg2 field picture mode.
  ffmetadec.c: fix compiler warnings.
  configure: Don't explicitly disable ffplay or in/outdevices on dos
  configure: Remove the explicit disabling of ffserver
  configure: Add fork as a dependency to ffserver

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'ffmpeg-mt/master'
Michael Niedermayer [Fri, 25 Mar 2011 01:37:37 +0000 (02:37 +0100)]
Merge remote-tracking branch 'ffmpeg-mt/master'

    * ffmpeg-mt/master:
      Update todo.
      Draw edges in MPV_frame_end when encoding

    Conflicts:
        libavcodec/mpegvideo.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove a tab, somehow it sneaked past the hooks in the merge war.
Michael Niedermayer [Fri, 25 Mar 2011 01:50:09 +0000 (02:50 +0100)]
Remove a tab, somehow it sneaked past the hooks in the merge war.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovp8.c: rename EDGE_* to VP8_EDGE_*.
Alexander Strange [Fri, 25 Mar 2011 01:20:13 +0000 (21:20 -0400)]
vp8.c: rename EDGE_* to VP8_EDGE_*.

8 years agoMake multiple Ctrl-C capable to kill stuck protocols.
Michael Niedermayer [Fri, 25 Mar 2011 01:26:49 +0000 (02:26 +0100)]
Make multiple Ctrl-C capable to kill stuck protocols.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix apparently exploitable race condition.
Michael Niedermayer [Fri, 25 Mar 2011 01:24:32 +0000 (02:24 +0100)]
Fix apparently exploitable race condition.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMore advanced ffmpeg mpeg2 aspect guessing code.
Michael Niedermayer [Fri, 25 Mar 2011 00:13:08 +0000 (01:13 +0100)]
More advanced ffmpeg mpeg2 aspect guessing code.
Fixes issue1613, 621, 562 simultaneously

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolog:Sanitize string of most control chars before printing.
Michael Niedermayer [Thu, 24 Mar 2011 23:20:07 +0000 (00:20 +0100)]
log:Sanitize string of most control chars before printing.
This may be security relevant depending upon the used terminal.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoIntel H.263 aspect ratio processing fix.
XV [Thu, 24 Mar 2011 21:32:21 +0000 (22:32 +0100)]
Intel H.263 aspect ratio processing fix.

8 years agoFix Intel I.263 "Strict H.263 compliance" file playback / issue2449
XV [Thu, 24 Mar 2011 21:29:31 +0000 (22:29 +0100)]
Fix Intel I.263 "Strict H.263 compliance"  file playback / issue2449

8 years agosrtdec: make sure we don't write past the end of buffer
Aurelien Jacobs [Fri, 25 Mar 2011 00:02:53 +0000 (01:02 +0100)]
srtdec: make sure we don't write past the end of buffer

Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
8 years agomatroskadec: set default duration for simple block
John Stebbins [Thu, 24 Mar 2011 23:34:18 +0000 (00:34 +0100)]
matroskadec: set default duration for simple block

When a normal Block is parsed, duration is initialized to
AV_NOPTS_VALUE.  If it is not changed, then the track's default
duration is used.  But for SimpleBlock, duration is initialized to
0 instead of AV_NOPTS_VALUE.  This is due to the difference in how
EBML_NEST vs EBML_PASS are processed.  Setting duration to 0 leads
eventually to wrongly estimate the frame duration in util.c

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agoWhen building for MinGW32 disable strict ANSI compliancy.
Diego Elio Pettenò [Thu, 24 Mar 2011 11:18:35 +0000 (12:18 +0100)]
When building for MinGW32 disable strict ANSI compliancy.

When -std=c99 is used, GCC defines __STRICT_ANSI__ to hide non-ANSI
interfaces; on MinGW32, when this macro is defined, some functions that are
part of POSIX but not of Windows APIs are disabled, including strcasecmp().

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agoARM: fix ff_apply_window_int16_neon() prototype
Mans Rullgard [Thu, 24 Mar 2011 20:22:34 +0000 (20:22 +0000)]
ARM: fix ff_apply_window_int16_neon() prototype

The length argument should be unsigned.  No change in code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoconfigure: check for --as-needed support early
Mans Rullgard [Sun, 6 Mar 2011 13:57:34 +0000 (13:57 +0000)]
configure: check for --as-needed support early

This moves the check for --as-needed linker support before all
library tests, ensuring consistent behaviour between the checks
and the actual link step.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoARM: NEON optimised apply_window_int16()
Mans Rullgard [Wed, 23 Mar 2011 01:45:43 +0000 (01:45 +0000)]
ARM: NEON optimised apply_window_int16()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoac3enc: NEON optimised shift functions
Mans Rullgard [Sat, 12 Mar 2011 23:16:06 +0000 (23:16 +0000)]
ac3enc: NEON optimised shift functions

8 years agoac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
Mans Rullgard [Wed, 9 Mar 2011 19:51:50 +0000 (19:51 +0000)]
ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min

8 years agompeg12.c: fix slice threading for mpeg2 field picture mode.
Ronald S. Bultje [Thu, 24 Mar 2011 16:16:22 +0000 (12:16 -0400)]
mpeg12.c: fix slice threading for mpeg2 field picture mode.

Fixes "make THREADS=2 fate-mpeg2-field-enc".

8 years agoImprove channel count and bitrate error handling in wmav* encode_init()
Tomas Härdin [Mon, 21 Mar 2011 09:52:36 +0000 (10:52 +0100)]
Improve channel count and bitrate error handling in wmav* encode_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmetadec.c: fix compiler warnings.
Ronald S. Bultje [Thu, 24 Mar 2011 11:41:03 +0000 (07:41 -0400)]
ffmetadec.c: fix compiler warnings.

8 years agoconfigure: Don't explicitly disable ffplay or in/outdevices on dos
Martin Storsjö [Wed, 23 Mar 2011 12:49:37 +0000 (12:49 +0000)]
configure: Don't explicitly disable ffplay or in/outdevices on dos

The normal dependency tracking system disables them just fine.

8 years agoconfigure: Remove the explicit disabling of ffserver
Martin Storsjö [Wed, 23 Mar 2011 11:13:31 +0000 (13:13 +0200)]
configure: Remove the explicit disabling of ffserver

It is automatically disabled on both mingw and dos due to
the lack of fork.

8 years agoconfigure: Add fork as a dependency to ffserver
Martin Storsjö [Wed, 23 Mar 2011 10:26:58 +0000 (12:26 +0200)]
configure: Add fork as a dependency to ffserver

8 years agoMerge remote-tracking branch 'newdev/master'
Michael Niedermayer [Thu, 24 Mar 2011 01:12:17 +0000 (02:12 +0100)]
Merge remote-tracking branch 'newdev/master'

* newdev/master:
  avio: make udp_set_remote_url/get_local_port internal.
  asfdec: also subtract preroll when reading simple index object
  matroskaenc: remove a variable that's unused after bc17bd9.
  avio: cosmetics - nicer vertical alignment.
  Remove unnecessary icc version checks
  Disable 'attribute "foo" ignored' warnings from icc
  rtsp: Don't use a locale dependent format string
  Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
  configure: get libavcodec version from new version.h header
  lavc: move the version macros to a new installed header.
  matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
  Do not use format string "%0.3f" for RTSP Range field.
  Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
  Document usage of import libraries created by dlltool
  configure: Set the correct lib target for arm/wince dlltool
  fate: simplify regression-funcs.sh
  fate: add support for multithread testing

Conflicts:
libavformat/rtspdec.c
libavutil/attributes.h
libavutil/internal.h
libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomatroskaenc: make sure we don't produce invalid file with no codec ID
Aurelien Jacobs [Thu, 24 Mar 2011 00:56:26 +0000 (01:56 +0100)]
matroskaenc: make sure we don't produce invalid file with no codec ID

Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
8 years agomatroskaenc: add missing new line in av_log() call
Aurelien Jacobs [Thu, 24 Mar 2011 00:54:15 +0000 (01:54 +0100)]
matroskaenc: add missing new line in av_log() call

Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
8 years agomatroskadec: check that pointers were initialized before accessing them
Aurelien Jacobs [Wed, 23 Mar 2011 23:28:19 +0000 (00:28 +0100)]
matroskadec: check that pointers were initialized before accessing them
fix ticket #14

Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
8 years agofix typo
Compn [Wed, 23 Mar 2011 17:53:24 +0000 (13:53 -0400)]
fix typo

8 years agoavio: make udp_set_remote_url/get_local_port internal.
Anton Khirnov [Tue, 8 Mar 2011 09:35:52 +0000 (10:35 +0100)]
avio: make udp_set_remote_url/get_local_port internal.

8 years agoasfdec: also subtract preroll when reading simple index object
Vladimir Pantelic [Thu, 17 Mar 2011 21:34:52 +0000 (22:34 +0100)]
asfdec: also subtract preroll when reading simple index object

This was missed when ASF was changed to return timestamps
without preroll.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agomatroskaenc: remove a variable that's unused after bc17bd9.
Anton Khirnov [Wed, 23 Mar 2011 10:09:34 +0000 (11:09 +0100)]
matroskaenc: remove a variable that's unused after bc17bd9.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoavio: cosmetics - nicer vertical alignment.
Anton Khirnov [Wed, 23 Mar 2011 11:58:02 +0000 (11:58 +0000)]
avio: cosmetics - nicer vertical alignment.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoRemove unnecessary icc version checks
Mans Rullgard [Wed, 23 Mar 2011 11:30:44 +0000 (11:30 +0000)]
Remove unnecessary icc version checks

With unknown attribute warnings disabled, these checks are no
longer needed.  Removing them improves readability while having
no effect on generated code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoDisable 'attribute "foo" ignored' warnings from icc
Mans Rullgard [Wed, 23 Mar 2011 11:24:10 +0000 (11:24 +0000)]
Disable 'attribute "foo" ignored' warnings from icc

ICC lies about the version of gcc it emulates, which results
in unsupported attributes sometimes being used.  The warning
is an annoyance and should be disabled.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agortsp: Don't use a locale dependent format string
Martin Storsjö [Wed, 23 Mar 2011 08:26:22 +0000 (10:26 +0200)]
rtsp: Don't use a locale dependent format string

In this particular case, we aren't ever printing anything else than
0.000 anyway.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoAdd xd55 codec tag for XDCAM HD422 720p25 CBR files.
Tomas Härdin [Mon, 21 Mar 2011 11:06:56 +0000 (12:06 +0100)]
Add xd55 codec tag for XDCAM HD422 720p25 CBR files.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoconfigure: get libavcodec version from new version.h header
Mans Rullgard [Wed, 23 Mar 2011 09:39:00 +0000 (09:39 +0000)]
configure: get libavcodec version from new version.h header

This fixes shared library versioning after 3dd851c.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agolavc: move the version macros to a new installed header.
Anton Khirnov [Mon, 14 Mar 2011 20:58:13 +0000 (21:58 +0100)]
lavc: move the version macros to a new installed header.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoMerge remote-tracking branch 'newdev/master'
Michael Niedermayer [Wed, 23 Mar 2011 01:42:56 +0000 (02:42 +0100)]
Merge remote-tracking branch 'newdev/master'

* newdev/master: (33 commits)
  Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
  Add kbdwin.o to AC3 decoder
  Detect byte-swapped AC-3 and support decoding it directly.
  cosmetics: indentation
  Always copy input data for AC3 decoder.
  ac3enc: make sym_quant() branch-free
  cosmetics: indentation
  Add a CPU flag for the Atom processor.
  id3v2: skip broken tags with invalid size
  id3v2: don't explicitly skip padding
  Make sure kbhit() is in conio.h
  fate: update wmv8-drm reference
  vc1: make P-frame deblock filter bit-exact.
  configure: Add the -D parameter to the dlltool command
  amr: Set the AVFMT_GENERIC_INDEX flag
  amr: Set the pkt->pos field properly to the start of the packet
  amr: Set the codec->bit_rate field based on the last packet
  rtsp: Specify unicast for TCP interleaved streams, too
  Set the correct target for mingw64 dlltool
  applehttp: Change the variable for stream position in seconds into int64_t
  ...

Conflicts:
ffmpeg.c
ffplay.c
libavcodec/ac3dec.c
libavformat/avio.h
libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomatroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
Anton Khirnov [Mon, 21 Mar 2011 08:05:36 +0000 (09:05 +0100)]
matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config

This also fixes broken SBR detection, which produced files with double
sample rate since 8ae0fa2.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoDo not use format string "%0.3f" for RTSP Range field.
Carl Eugen Hoyos [Tue, 22 Mar 2011 21:38:44 +0000 (22:38 +0100)]
Do not use format string "%0.3f" for RTSP Range field.

The format string was locale-depending.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoAdd apply_window_int16() to DSPContext with x86-optimized versions and use it
Justin Ruggles [Sun, 20 Mar 2011 17:31:36 +0000 (13:31 -0400)]
Add apply_window_int16() to DSPContext with x86-optimized versions and use it
in the ac3_fixed encoder.

8 years agoDocument usage of import libraries created by dlltool
Martin Storsjö [Tue, 22 Mar 2011 13:07:16 +0000 (15:07 +0200)]
Document usage of import libraries created by dlltool

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agoconfigure: Set the correct lib target for arm/wince dlltool
Martin Storsjö [Tue, 22 Mar 2011 13:07:15 +0000 (15:07 +0200)]
configure: Set the correct lib target for arm/wince dlltool

The correct machine name for dlltool is arm-wince.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agofate: simplify regression-funcs.sh
Luca Barbato [Mon, 21 Mar 2011 23:13:48 +0000 (00:13 +0100)]
fate: simplify regression-funcs.sh

Factor ffmpeg calls using run_ffmpeg()

8 years agofate: add support for multithread testing
Luca Barbato [Mon, 21 Mar 2011 23:07:54 +0000 (00:07 +0100)]
fate: add support for multithread testing

Add a THREADS variable to fate calls.

8 years agoFix an infinite loop when RoQ encoded generated a frame with a size greater than...
Vitor Sessak [Sun, 20 Mar 2011 17:30:29 +0000 (18:30 +0100)]
Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoAdd kbdwin.o to AC3 decoder
Kieran Kunhya [Tue, 22 Mar 2011 22:17:41 +0000 (22:17 +0000)]
Add kbdwin.o to AC3 decoder

Fixes --disable-everything --enable-decoder=ac3

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoDo not use format string "%0.3f" for RTSP Range field.
Carl Eugen Hoyos [Tue, 22 Mar 2011 21:38:44 +0000 (22:38 +0100)]
Do not use format string "%0.3f" for RTSP Range field.

Fixes ticket 10.
The format string was locale-depending.

8 years agoFake-Merge remote-tracking branch 'ffmpeg-mt/master'
Michael Niedermayer [Tue, 22 Mar 2011 21:36:57 +0000 (22:36 +0100)]
Fake-Merge remote-tracking branch 'ffmpeg-mt/master'

8 years agoDetect byte-swapped AC-3 and support decoding it directly.
Reimar Döffinger [Tue, 22 Mar 2011 18:22:07 +0000 (14:22 -0400)]
Detect byte-swapped AC-3 and support decoding it directly.

This allows the AC-3 decoder to be used directly with RealMedia
decoders that unlike the libavformat one do not byte-swap automatically.
Since the new code is only used in case we would fail directly otherwise
there should be no risk for regressions.

8 years agocosmetics: indentation
Justin Ruggles [Tue, 22 Mar 2011 18:14:41 +0000 (14:14 -0400)]
cosmetics: indentation

8 years agoAlways copy input data for AC3 decoder.
Justin Ruggles [Tue, 22 Mar 2011 18:11:34 +0000 (14:11 -0400)]
Always copy input data for AC3 decoder.

Depending on error_recognition is not correct, low values do
certainly not mean it is ok to crash.

Based on a patch by Reimar Döffinger <Reimar.Doeffinger@gmx.de>

8 years agoac3enc: make sym_quant() branch-free
Justin Ruggles [Tue, 22 Mar 2011 18:36:18 +0000 (14:36 -0400)]
ac3enc: make sym_quant() branch-free

8 years agocosmetics: indentation
Justin Ruggles [Tue, 22 Mar 2011 03:33:00 +0000 (23:33 -0400)]
cosmetics: indentation

8 years agoAdd a CPU flag for the Atom processor.
Justin Ruggles [Tue, 22 Mar 2011 03:32:40 +0000 (23:32 -0400)]
Add a CPU flag for the Atom processor.

The Atom has SSSE3 support, which is useful in many cases, but sometimes the
SSSE3 version is slower than the SSE2 equivalent on the Atom, but is generally
faster on other processors supporting SSSE3. This flag allows for selectively
disabling certain SSSE3 functions on the Atom.

8 years agoid3v2: skip broken tags with invalid size
Anton Khirnov [Tue, 22 Mar 2011 09:35:35 +0000 (10:35 +0100)]
id3v2: skip broken tags with invalid size

fixes issue2649.

8 years agoid3v2: don't explicitly skip padding
Anton Khirnov [Tue, 22 Mar 2011 09:35:34 +0000 (10:35 +0100)]
id3v2: don't explicitly skip padding

It's pointless, since there's a seek to the end of tag later.

8 years agoMake sure kbhit() is in conio.h
Dave Yeo [Tue, 22 Mar 2011 03:47:48 +0000 (03:47 +0000)]
Make sure kbhit() is in conio.h

Conio.h is a non-standard header and may not have kbhit()
prototyped. This fixes compile on OS/2 where the EMX version (we're
using a fork) of conio.h only has getch() and getche().

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agofate: update wmv8-drm reference
Mans Rullgard [Tue, 22 Mar 2011 02:49:37 +0000 (02:49 +0000)]
fate: update wmv8-drm reference

This updates the wmv8-drm reference after c47d383.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agovc1: make P-frame deblock filter bit-exact.
Ronald S. Bultje [Tue, 22 Mar 2011 01:26:26 +0000 (21:26 -0400)]
vc1: make P-frame deblock filter bit-exact.

8 years agoconfigure: Add the -D parameter to the dlltool command
Martin Storsjö [Mon, 21 Mar 2011 20:41:38 +0000 (22:41 +0200)]
configure: Add the -D parameter to the dlltool command

This is required for the generated .lib file to actually
be usable by MSVC.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agoamr: Set the AVFMT_GENERIC_INDEX flag
Martin Storsjö [Wed, 9 Feb 2011 10:19:39 +0000 (12:19 +0200)]
amr: Set the AVFMT_GENERIC_INDEX flag

This makes the amr demuxer support seeking, closing roundup
issue 2593.

8 years agoamr: Set the pkt->pos field properly to the start of the packet
Martin Storsjö [Wed, 9 Feb 2011 10:16:51 +0000 (12:16 +0200)]
amr: Set the pkt->pos field properly to the start of the packet

Previously, the field pointed to the second byte of the packet
(which is the first byte of the actual AMR payload).

8 years agoamr: Set the codec->bit_rate field based on the last packet
Martin Storsjö [Wed, 9 Feb 2011 10:13:32 +0000 (12:13 +0200)]
amr: Set the codec->bit_rate field based on the last packet

This allows libavformat to guess an estimated duration for
amr files.

For streams with varying bit rates (or with silence descriptors
or "no frame" blocks) the guess is, of course, inaccurate.