ffmpeg.git
9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Sun, 10 Apr 2011 01:31:53 +0000 (03:31 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  daud: Don't write packets that are too large to have their size expressed in the bytestream.
DUPLICATE  pthread: validate_thread_parameters() ignored slice-threading being intentionally off
DUPLICATE  Use consistent condition for whether to run slice-threading execute function.
  avformat.h: fix a misplaced #endif
DUPLCIATE  vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge.
DUPLICATE  vaapi: filter out DELAYED_PIC_REF flag to determine field.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodaud: Don't write packets that are too large to have their size expressed in the...
Alex Converse [Fri, 8 Apr 2011 21:35:17 +0000 (14:35 -0700)]
daud: Don't write packets that are too large to have their size expressed in the bytestream.

9 years agoAbort Ogg header parsing when we encounter a data packet.
Reimar Döffinger [Thu, 7 Apr 2011 23:17:21 +0000 (01:17 +0200)]
Abort Ogg header parsing when we encounter a data packet.

Fixes ticket #15.

9 years agopthread: validate_thread_parameters() ignored slice-threading being intentionally off
Alexander Strange [Sun, 3 Apr 2011 19:54:14 +0000 (15:54 -0400)]
pthread: validate_thread_parameters() ignored slice-threading being intentionally off

The thread_type API allows you to request only FF_THREAD_FRAME (instead of
FRAME | SLICE), but it was being ignored.
We don't implement both of them at the same time, so there isn't an effect
on current codecs, except that you can request no kinds of threading now
(a bit useless).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoUse consistent condition for whether to run slice-threading execute function.
Reimar Döffinger [Sat, 2 Apr 2011 00:24:46 +0000 (20:24 -0400)]
Use consistent condition for whether to run slice-threading execute function.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavformat.h: fix a misplaced #endif
Anton Khirnov [Sat, 9 Apr 2011 05:30:33 +0000 (07:30 +0200)]
avformat.h: fix a misplaced #endif

9 years agovaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge.
Gwenole Beauchesne [Tue, 29 Mar 2011 08:52:15 +0000 (10:52 +0200)]
vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge.

(cherry picked from commit a18e7b4fb77d3799cf21110b5e6dda4691a295b3)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
9 years agovaapi: filter out DELAYED_PIC_REF flag to determine field.
Gwenole Beauchesne [Tue, 29 Mar 2011 09:07:29 +0000 (11:07 +0200)]
vaapi: filter out DELAYED_PIC_REF flag to determine field.

This fixes ticket #23.

(cherry picked from commit 621f4c98df4ee9fd604a614f31e09eef9dd7d3ca)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
9 years agoCrystalHD: Improve detection of h.264 content.
Philip Langdale [Sat, 26 Mar 2011 17:34:20 +0000 (10:34 -0700)]
CrystalHD: Improve detection of h.264 content.

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 most MBAFF and PAFF content until
it's too late.

In an attempt to compensate for this, I'm introducing two mechanisms:

1) Peeking at the picture number of the next picture

The hardware provides a capability to peek the next picture number. If
it is the same as the current picture number, then we are clearly dealing
with two fields and not a frame or fieldpair.

If this always worked, it would be all we need, but it's not guaranteed
to work. Sometimes, the next picture may not be decoded sufficiently
for the number to be known; alternately, a corruption in the stream may
cause the hardware to refuse to return the number even if the next
intact frame is decoded. In either case, the query will return 0.

If we are unable to peek the next picture number, we assume that the
picture is a frame/fieldpair and return it accordingly. If that turns
out to be incorrect, we discard the second field, and the user has
to live with the glitch. In testing, false detection can occur for
the first couple of seconds, and then the pipeline stabalizes and
we get correct detection.

2) Use the h264_parser to detect when individual input fields have
been combined into an output fieldpair.

I have multiple PAFF samples where this behaviour is detected. The
peeking mechanism described above will correctly detect that the
output is a fieldpair, but we need to know what the input type was
to ensure pipeline stability (only return one output frame per input
frame).

If we find ourselves with an output fieldpair, yet the input picture
type was a field, as reported by the parser, then we are dealing with
this case, and can make sure not to return anything on the next
decode() call.

Taken together, these allow us to remove the hard-coded hacks for
different h.264 types, and we can clearly describe the conditions
under which we can trust the hardware's claim that content is
interlaced.

Signed-off-by: Philip Langdale <philipl@overt.org>
9 years agoCrystalHD: Carry picture type from input to output picture.
Philip Langdale [Sat, 26 Mar 2011 05:48:41 +0000 (22:48 -0700)]
CrystalHD: Carry picture type from input to output picture.

Now that we know the type of the input picture, we have to bring
that information to the output picture to help identify its type.
We do this by adding a field to the opaque_list node.

Signed-off-by: Philip Langdale <philipl@overt.org>
9 years agoCrystalHD: Bring in h.264 parser to establish picture type.
Philip Langdale [Sat, 26 Mar 2011 05:46:22 +0000 (22:46 -0700)]
CrystalHD: Bring in h.264 parser to establish picture type.

As the hardware is unreliable, we will have to use the h.264 parser
to identify whether an input picture is a field or a frame. This
change loads the parser and extracts the picture type.

Signed-off-by: Philip Langdale <philipl@overt.org>
9 years agoCrystalHD: Change opaque_list_pop to return the node.
Philip Langdale [Sat, 26 Mar 2011 05:43:53 +0000 (22:43 -0700)]
CrystalHD: Change opaque_list_pop to return the node.

In preparation for adding additional fields to the node, return
the node instead of the pts value. This requires the caller to
free the node.

Signed-off-by: Philip Langdale <philipl@overt.org>
9 years agoCrystalHD: Fix whitespace after previous change.
Philip Langdale [Sun, 27 Mar 2011 16:39:16 +0000 (09:39 -0700)]
CrystalHD: Fix whitespace after previous change.

'git diff -w' confirmed to return nothing.

Signed-off-by: Philip Langdale <philipl@overt.org>
9 years agoCrystalHD: Handle different h.264 MBAFF packing.
Philip Langdale [Sun, 27 Mar 2011 16:37:49 +0000 (09:37 -0700)]
CrystalHD: Handle different h.264 MBAFF packing.

I found another MBAFF sample where the input:output pattern is
the same as mpeg2 and vc1 (fieldpair input, individual field output).
While I'm not sure how you can output individual fields from MBAFF,
if I apply the mpeg2/vc1 handling to this file, it plays correctly.

So, this changes the detection algorithm to handle the known cases.

Whitespace will be fixed in a separate change.

Signed-off-by: Philip Langdale <philipl@overt.org>
9 years agoflv: Only parse keyframe index when the underlaying protocol allows seeking as we...
Michael Niedermayer [Fri, 8 Apr 2011 22:03:01 +0000 (00:03 +0200)]
flv: Only parse keyframe index when the underlaying protocol allows seeking as we need to seek to read the index
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix support for flvtool2 "keyframes based" generated index in FLV format decoder
Kharkov Alexander [Fri, 8 Apr 2011 09:20:45 +0000 (16:20 +0700)]
Fix support for flvtool2 "keyframes based" generated index in FLV format decoder

Current keyframes data parser unconditionally rewind metadata to the end
at the end of function. As result ALL metadata located after keyframes
index not parsed,
and as metadata object can have ANY placement inside metadata it can
lead to unpredictable result
(bitrate can not be found, etc.). As result FLV movie will not play at
all in such situation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoReplace outdated info on the FAQ
Lou Logan [Thu, 7 Apr 2011 22:26:49 +0000 (14:26 -0800)]
Replace outdated info on the FAQ

FAQ could use some work. This updates a few little details.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Sat, 9 Apr 2011 01:09:49 +0000 (03:09 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  lavf: bump minor and add an APIChanges entry for avformat cleanup
  lavf: get rid of ffm-specific stuff in avformat.h
Not pulled:  avio: deprecate av_protocol_next().
  avio: add a function for iterating though protocol names.
  lavf: rename a parameter of av_sdp_create from buff->buf
  lavf: rename avf_sdp_create to av_sdp_create.
  lavf: make av_guess_image2_codec internal
  avio: make URLProtocol internal.
  avio: make URLContext internal.
  lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
  lavf: use designated initializers for all protocols
  applehttp: don't use deprecated url_ functions.
  avio: move two ff_udp_* functions from avio_internal to url.h
  asfdec: remove a forgotten declaration of nonexistent function
  avio: deprecate the typedef for URLInterruptCB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix ticket21, temporary audio array was too small.
Michael Niedermayer [Fri, 8 Apr 2011 23:00:44 +0000 (01:00 +0200)]
Fix ticket21, temporary audio array was too small.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: bump minor and add an APIChanges entry for avformat cleanup
Anton Khirnov [Fri, 8 Apr 2011 09:46:52 +0000 (11:46 +0200)]
lavf: bump minor and add an APIChanges entry for avformat cleanup

9 years agolavf: get rid of ffm-specific stuff in avformat.h
Anton Khirnov [Fri, 8 Apr 2011 09:21:13 +0000 (11:21 +0200)]
lavf: get rid of ffm-specific stuff in avformat.h

9 years agoavio: deprecate av_protocol_next().
Anton Khirnov [Mon, 4 Apr 2011 18:28:58 +0000 (20:28 +0200)]
avio: deprecate av_protocol_next().

9 years agoavio: add a function for iterating though protocol names.
Anton Khirnov [Mon, 4 Apr 2011 06:18:54 +0000 (08:18 +0200)]
avio: add a function for iterating though protocol names.

9 years agolavf: rename a parameter of av_sdp_create from buff->buf
Anton Khirnov [Fri, 8 Apr 2011 10:22:39 +0000 (12:22 +0200)]
lavf: rename a parameter of av_sdp_create from buff->buf

This is more consistent with the rest of the API.

9 years agolavf: rename avf_sdp_create to av_sdp_create.
Anton Khirnov [Fri, 8 Apr 2011 09:36:12 +0000 (11:36 +0200)]
lavf: rename avf_sdp_create to av_sdp_create.

The new name is more consistent with the rest of the API.

9 years agolavf: make av_guess_image2_codec internal
Anton Khirnov [Tue, 5 Apr 2011 11:13:53 +0000 (13:13 +0200)]
lavf: make av_guess_image2_codec internal

It doesn't look very useful as a public function.

9 years agoavio: make URLProtocol internal.
Anton Khirnov [Thu, 7 Apr 2011 19:01:17 +0000 (21:01 +0200)]
avio: make URLProtocol internal.

9 years agoavio: make URLContext internal.
Anton Khirnov [Thu, 7 Apr 2011 18:25:52 +0000 (20:25 +0200)]
avio: make URLContext internal.

9 years agolavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
Anton Khirnov [Tue, 5 Apr 2011 10:59:27 +0000 (12:59 +0200)]
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.

9 years agoCleanup 'Fix spurious warning when stream has SPS and PPS units.'
Michael Niedermayer [Fri, 8 Apr 2011 10:26:45 +0000 (12:26 +0200)]
Cleanup 'Fix spurious warning when stream has SPS and PPS units.'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: use designated initializers for all protocols
Anton Khirnov [Fri, 8 Apr 2011 05:41:47 +0000 (07:41 +0200)]
lavf: use designated initializers for all protocols

This is more readable and makes it easier to reorder URLProtocol
members.

9 years agoapplehttp: don't use deprecated url_ functions.
Anton Khirnov [Fri, 8 Apr 2011 04:57:54 +0000 (06:57 +0200)]
applehttp: don't use deprecated url_ functions.

9 years agoavio: move two ff_udp_* functions from avio_internal to url.h
Anton Khirnov [Thu, 7 Apr 2011 18:15:43 +0000 (20:15 +0200)]
avio: move two ff_udp_* functions from avio_internal to url.h

9 years agoasfdec: remove a forgotten declaration of nonexistent function
Anton Khirnov [Thu, 7 Apr 2011 18:13:36 +0000 (20:13 +0200)]
asfdec: remove a forgotten declaration of nonexistent function

9 years agoavio: deprecate the typedef for URLInterruptCB
Anton Khirnov [Thu, 7 Apr 2011 17:17:55 +0000 (19:17 +0200)]
avio: deprecate the typedef for URLInterruptCB

There's no particular reason to pollute the namespace with a typedef for
it.

9 years ago Merge remote-tracking branch 'ffmpeg-mt/master'
Alexander Strange [Fri, 8 Apr 2011 01:03:03 +0000 (03:03 +0200)]
Merge remote-tracking branch 'ffmpeg-mt/master'

    * ffmpeg-mt/master:
DUPLICATE mingw32 compilation after 'unbreak avcodec_thread_init'
      pthread: validate_thread_parameters() ignored slice-threading being intentionally off
DUPLICATE Remove unnecessary parameter from ff_thread_init() and fix behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Fri, 8 Apr 2011 00:50:13 +0000 (02:50 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  proto: include os_support.h in network.h
  matroskaenc: don't write an empty Cues element.
  lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
  avio: move extern url_interrupt_cb declaration from avio.h to url.h
  avio: make av_register_protocol2 internal.
  avio: avio_ prefix for url_set_interrupt_cb.
  avio: AVIO_ prefixes for URL_ open flags.
  proto: introduce listen option in tcp
  doc: clarify configure features
  proto: factor ff_network_wait_fd and use it on udp

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofix another forgotten mplayerhq.hu link
Michael Niedermayer [Thu, 7 Apr 2011 23:35:43 +0000 (01:35 +0200)]
fix another forgotten mplayerhq.hu link
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix link to ffmpeg-devel
Michael Niedermayer [Thu, 7 Apr 2011 22:17:53 +0000 (00:17 +0200)]
Fix link to ffmpeg-devel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix deblocking with thread_slices
Michael Niedermayer [Thu, 7 Apr 2011 22:15:09 +0000 (00:15 +0200)]
Fix deblocking with thread_slices
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffplay: Set EMU_EDGE if dr1, this is an alternative fix for ticket40.
Michael Niedermayer [Thu, 7 Apr 2011 13:12:03 +0000 (15:12 +0200)]
ffplay: Set EMU_EDGE if dr1, this is an alternative fix for ticket40.
Idea borrowed from mplayer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoproto: include os_support.h in network.h
Luca Barbato [Thu, 7 Apr 2011 13:09:03 +0000 (15:09 +0200)]
proto: include os_support.h in network.h

Fix compilation on systems without poll()

9 years agomatroskaenc: don't write an empty Cues element.
Anton Khirnov [Mon, 4 Apr 2011 20:29:21 +0000 (22:29 +0200)]
matroskaenc: don't write an empty Cues element.

9 years agolavc: add a FF_API_REQUEST_CHANNELS deprecation macro
Anton Khirnov [Wed, 6 Apr 2011 05:38:11 +0000 (07:38 +0200)]
lavc: add a FF_API_REQUEST_CHANNELS deprecation macro

And hide request_channels AVOption under it.

9 years agoavio: move extern url_interrupt_cb declaration from avio.h to url.h
Anton Khirnov [Mon, 4 Apr 2011 18:40:38 +0000 (20:40 +0200)]
avio: move extern url_interrupt_cb declaration from avio.h to url.h

9 years agoavio: make av_register_protocol2 internal.
Anton Khirnov [Mon, 4 Apr 2011 18:35:04 +0000 (20:35 +0200)]
avio: make av_register_protocol2 internal.

9 years agoavio: avio_ prefix for url_set_interrupt_cb.
Anton Khirnov [Mon, 4 Apr 2011 18:15:44 +0000 (20:15 +0200)]
avio: avio_ prefix for url_set_interrupt_cb.

9 years agoavio: AVIO_ prefixes for URL_ open flags.
Anton Khirnov [Mon, 4 Apr 2011 18:11:19 +0000 (20:11 +0200)]
avio: AVIO_ prefixes for URL_ open flags.

9 years agoriff: add ATRAC3+ guid
Peter Ross [Tue, 5 Apr 2011 10:37:19 +0000 (20:37 +1000)]
riff: add ATRAC3+ guid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoff_get_wav_header: perform full lookup on WAVEFORMATEXTENSIBLE subformat guid
Peter Ross [Thu, 7 Apr 2011 10:53:24 +0000 (20:53 +1000)]
ff_get_wav_header: perform full lookup on WAVEFORMATEXTENSIBLE subformat guid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomove PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, MEDIASUBTYPE_BASE_GUID...
Peter Ross [Tue, 5 Apr 2011 10:36:55 +0000 (20:36 +1000)]
move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomove ff_asf_guid, ff_guidcmp and ff_get_guid into riff.h
Peter Ross [Tue, 5 Apr 2011 10:36:46 +0000 (20:36 +1000)]
move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoInstall libavutil/{aes,sha}.h
Alexis Ballier [Thu, 7 Apr 2011 13:19:23 +0000 (10:19 -0300)]
Install libavutil/{aes,sha}.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopad: fix example explanation
Stefano Sabatini [Thu, 7 Apr 2011 15:45:31 +0000 (17:45 +0200)]
pad: fix example explanation

"row" and "column" term positions in the explanation were inverted.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Thu, 7 Apr 2011 01:32:26 +0000 (03:32 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  Fix parser: mark av_parser_parse() for removal on next major bump
  swscale: postpone sws_getContext removal until next major bump.
  fate: add AAC LATM test
  mmst: get rid of deprecated AVERRORs
  lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.
  Reemove remaining uses of deprecated AVERROR_NOTSUPP.
REIMPLEMENTED in 2 lines of code:  lavf: if id3v2 tag is present and all else fails, guess by file extension

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoproto: introduce listen option in tcp
Luca Barbato [Fri, 4 Mar 2011 00:41:22 +0000 (01:41 +0100)]
proto: introduce listen option in tcp

This way is possible to have simple micro-server act like

ffmpeg -i file.nut -vcodec copy -acodec copy -f nut tcp://foo:1234?listen

9 years agodoc: clarify configure features
Luca Barbato [Mon, 4 Apr 2011 15:43:45 +0000 (17:43 +0200)]
doc: clarify configure features

This way people will not get surprises regarding the current configure
behaviour and contributors will have a guideline on what is expected.

9 years agoproto: factor ff_network_wait_fd and use it on udp
Luca Barbato [Mon, 4 Apr 2011 16:17:12 +0000 (18:17 +0200)]
proto: factor ff_network_wait_fd and use it on udp

Support the URL_FLAG_NONBLOCK semantic and uniform the protocol.
The quick retry loop is already part of retry_transfer_wrapper.

The polling routine is common to the network protocols:
udp, tcp and, once merged, sctp.

9 years agoAlign stack variables manually in yadif x86 code, should fix ticket25
Michael Niedermayer [Wed, 6 Apr 2011 22:31:21 +0000 (00:31 +0200)]
Align stack variables manually in yadif x86 code, should fix ticket25
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomove image check down in ffplay.c
Michael Niedermayer [Wed, 6 Apr 2011 22:24:53 +0000 (00:24 +0200)]
move image check down in ffplay.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoDisable dr1 in ffplay for svq1 (fixes ticket40)
Michael Niedermayer [Wed, 6 Apr 2011 21:41:02 +0000 (23:41 +0200)]
Disable dr1 in ffplay for svq1 (fixes ticket40)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix parser: mark av_parser_parse() for removal on next major bump
Brad [Wed, 6 Apr 2011 21:41:12 +0000 (17:41 -0400)]
Fix parser: mark av_parser_parse() for removal on next major bump

Fix the breakage introduced with 9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d

9 years agoCheck sizes a bit in ffplay, cant hurt.
Michael Niedermayer [Wed, 6 Apr 2011 21:39:57 +0000 (23:39 +0200)]
Check sizes a bit in ffplay, cant hurt.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix ticket34
Michael Niedermayer [Wed, 6 Apr 2011 21:06:47 +0000 (23:06 +0200)]
Fix ticket34
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoDrop checkheaders from check, its useless
Michael Niedermayer [Wed, 6 Apr 2011 19:49:25 +0000 (21:49 +0200)]
Drop checkheaders from check, its useless
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix ticket20
Michael Niedermayer [Wed, 6 Apr 2011 19:17:32 +0000 (21:17 +0200)]
Fix ticket20
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale: postpone sws_getContext removal until next major bump.
Anton Khirnov [Wed, 6 Apr 2011 12:46:31 +0000 (14:46 +0200)]
swscale: postpone sws_getContext removal until next major bump.

The replacement isn't ready yet.

9 years agofate: add AAC LATM test
Janne Grunau [Tue, 5 Apr 2011 18:25:48 +0000 (20:25 +0200)]
fate: add AAC LATM test

9 years agoAdd PlayStation Portable PMP format demuxer
Reimar Döffinger [Sat, 26 Mar 2011 15:25:10 +0000 (16:25 +0100)]
Add PlayStation Portable PMP format demuxer

Not yet complete, for demuxing AAC the AAC header must be generated
manually.
Possibly the decoder could accept the header as extradata to simplify
this.

9 years agommst: get rid of deprecated AVERRORs
Anton Khirnov [Wed, 6 Apr 2011 06:20:09 +0000 (08:20 +0200)]
mmst: get rid of deprecated AVERRORs

9 years agolxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.
Anton Khirnov [Wed, 6 Apr 2011 06:18:16 +0000 (08:18 +0200)]
lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.

9 years agoReemove remaining uses of deprecated AVERROR_NOTSUPP.
Anton Khirnov [Wed, 6 Apr 2011 06:16:06 +0000 (08:16 +0200)]
Reemove remaining uses of deprecated AVERROR_NOTSUPP.

9 years agolavf: if id3v2 tag is present and all else fails, guess by file extension
Anton Khirnov [Tue, 5 Apr 2011 10:19:35 +0000 (12:19 +0200)]
lavf: if id3v2 tag is present and all else fails, guess by file extension

9 years agoRevert "ffmpeg: fix aspect ratio setting"
Michael Niedermayer [Wed, 6 Apr 2011 01:00:46 +0000 (03:00 +0200)]
Revert "ffmpeg: fix aspect ratio setting"

This reverts commit d1eb50bb29caad9745631759265f475177df99b9.
Reason, it breaks fate

9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Wed, 6 Apr 2011 00:59:49 +0000 (02:59 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  psymodel: extend API to include PE and bit allocation.
  avio: always compile dyn_buf functions
  Remove unnecessary parameter from ff_thread_init() and fix behavior
  Revert "aac_latm_dec: use aac context and aac m4ac"
  configure: tell user if libva is enabled like the rest of external libs.
  Add silence support for AV_SAMPLE_FMT_U8.
  avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal
  avio: deprecate av_url_read_seek
  avio: deprecate av_url_read_pause
  ac3enc: NEON optimised extract_exponents

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix ffmpeg-mt fixme in h264.
Michael Niedermayer [Tue, 5 Apr 2011 22:15:42 +0000 (00:15 +0200)]
Fix ffmpeg-mt fixme in h264.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix REBASE_PICTURE with h.264
Michael Niedermayer [Tue, 5 Apr 2011 22:14:56 +0000 (00:14 +0200)]
Fix REBASE_PICTURE with h.264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix crash in ffmpeg.c with PIX_FMT_NONE
Michael Niedermayer [Tue, 5 Apr 2011 21:22:08 +0000 (23:22 +0200)]
Fix crash in ffmpeg.c with PIX_FMT_NONE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "Set the correct target for mingw64 dlltool"
Michael Niedermayer [Tue, 5 Apr 2011 18:46:46 +0000 (20:46 +0200)]
Revert "Set the correct target for mingw64 dlltool"
Revert due to dlltool/lib revert
This reverts commit 417516f63f8a9ee214ee9fa6fcb483962ea0f096.

9 years agoFix gazeta-20090408-1456-aa.ts
Michael Niedermayer [Tue, 5 Apr 2011 16:27:15 +0000 (18:27 +0200)]
Fix gazeta-20090408-1456-aa.ts
regression introduced by 15957b197a63d08c33c34f08ef8b161335736914
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix Ticket37
Michael Niedermayer [Tue, 5 Apr 2011 09:51:58 +0000 (11:51 +0200)]
Fix Ticket37

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopsymodel: extend API to include PE and bit allocation.
Nathan Caldwell [Tue, 5 Apr 2011 07:05:22 +0000 (01:05 -0600)]
psymodel: extend API to include PE and bit allocation.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoavio: always compile dyn_buf functions
Anton Khirnov [Tue, 5 Apr 2011 17:04:28 +0000 (19:04 +0200)]
avio: always compile dyn_buf functions

Fixes build with --disable-muxers --disable-network.

Thanks to Hendrik Leppkes for noticing.

9 years agoDo not offer unsupported HWAccel PIX_FMT.
Reimar Döffinger [Mon, 4 Apr 2011 18:02:42 +0000 (20:02 +0200)]
Do not offer unsupported HWAccel PIX_FMT.

Only fixes MPEG-1/MPEG-2 as a first step.

9 years agoUse CONFIG_VDPAU as condition for using ff_vdpau_mpeg_picture_complete.
Reimar Döffinger [Mon, 4 Apr 2011 18:11:19 +0000 (20:11 +0200)]
Use CONFIG_VDPAU as condition for using ff_vdpau_mpeg_picture_complete.

CONFIG_VDPAU is the condition on which ff_vdpau_mpeg_picture_complete
is compiled in, so it is more appropriate, particularly since the
separate VDPAU decoder should be removed in the longer term.

9 years agoac3dec: avoid pointless alloc and indirection for input_buffer
Reimar Döffinger [Thu, 24 Mar 2011 20:27:05 +0000 (21:27 +0100)]
ac3dec: avoid pointless alloc and indirection for input_buffer

Since we now always allocate it, it can simply be made part of the context
instead.

9 years agoRemove unnecessary parameter from ff_thread_init() and fix behavior
Alexander Strange [Tue, 29 Mar 2011 21:18:21 +0000 (17:18 -0400)]
Remove unnecessary parameter from ff_thread_init() and fix behavior

thread_count passed to ff_thread_init() is only used to set AVCodecContext.
thread_count, and can be removed. Instead move it to the legacy implementation
of avcodec_thread_init().

This also fixes the problem that calling avcodec_thread_init() with pthreads
enabled did not set it since ff1efc524cb3c60f2f746e3b4550bb1a86c65316.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agodocumentation: fix @url syntax in developer.texi
Stefano Sabatini [Tue, 5 Apr 2011 13:31:14 +0000 (15:31 +0200)]
documentation: fix @url syntax in developer.texi

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoscale: make the filter parametric
Stefano Sabatini [Sun, 27 Mar 2011 20:58:08 +0000 (22:58 +0200)]
scale: make the filter parametric

Make the filter accept parametric expressions for the output video
size.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoeval: add support for trunc, ceil, and floor functions
Stefano Sabatini [Sun, 27 Mar 2011 20:56:49 +0000 (22:56 +0200)]
eval: add support for trunc, ceil, and floor functions

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffmpeg: fix aspect ratio setting
Stefano Sabatini [Mon, 4 Apr 2011 00:15:34 +0000 (02:15 +0200)]
ffmpeg: fix aspect ratio setting

This is done by adding a setsar filter at the beginning of the
configured filterchain.

This implementation is more robust, since does not modify the
filterchain description (which was creating potential syntax errors),
but directly modifies the filterchain structure.

This also changes the ffmpeg -aspect behavior, as following filters in
the filterchain can change the DAR/SAR set by the inserted setsar
filter.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoAdd support for pcm_f32* to alsa.
Carl Eugen Hoyos [Tue, 5 Apr 2011 14:12:41 +0000 (16:12 +0200)]
Add support for pcm_f32* to alsa.

9 years agoAdd audio_float to confgigure's CONFIG list.
Carl Eugen Hoyos [Tue, 5 Apr 2011 13:14:51 +0000 (15:14 +0200)]
Add audio_float to confgigure's CONFIG list.

9 years agoRevert "aac_latm_dec: use aac context and aac m4ac"
Janne Grunau [Tue, 5 Apr 2011 10:21:50 +0000 (12:21 +0200)]
Revert "aac_latm_dec: use aac context and aac m4ac"

This reverts commit 36864ac3540445c513484017aa9927e942fac24a since it
breaks LATM decoding in ffplay.

9 years agoSupport s32 output via alsa audio device.
Carl Eugen Hoyos [Tue, 5 Apr 2011 08:53:50 +0000 (10:53 +0200)]
Support s32 output via alsa audio device.

9 years agoTemplate alsa reordering functions.
Carl Eugen Hoyos [Tue, 5 Apr 2011 08:15:03 +0000 (10:15 +0200)]
Template alsa reordering functions.

9 years agoconfigure: tell user if libva is enabled like the rest of external libs.
Konstantin Pavlov [Mon, 4 Apr 2011 20:49:34 +0000 (00:49 +0400)]
configure: tell user if libva is enabled like the rest of external libs.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoAdd silence support for AV_SAMPLE_FMT_U8.
Alex Converse [Mon, 4 Apr 2011 23:07:23 +0000 (16:07 -0700)]
Add silence support for AV_SAMPLE_FMT_U8.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoavio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal
Anton Khirnov [Mon, 4 Apr 2011 17:55:07 +0000 (19:55 +0200)]
avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal

9 years agoavio: deprecate av_url_read_seek
Anton Khirnov [Mon, 4 Apr 2011 17:48:31 +0000 (19:48 +0200)]
avio: deprecate av_url_read_seek

It's not used anywhere internally.

Salvage its documentation for ffio_read_seek.