ffmpeg.git
10 years agoBink version 'b' video decoder
Peter Ross [Fri, 11 Feb 2011 12:31:32 +0000 (23:31 +1100)]
Bink version 'b' video decoder

Based on original patch by Kostya Shishkov

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e00f41d5742b3a0dc1877b030f4f6f58c19b7bbd)

10 years agolavf: deprecate AVFormatContext.index_built
Anton Khirnov [Thu, 10 Feb 2011 08:36:44 +0000 (09:36 +0100)]
lavf: deprecate AVFormatContext.index_built

it's not touched anywhere in ffmpeg, the code setting it was removed
over two years ago (e9b78eeba22b050810a507e69df1b652e56ab62b).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b0294c80d3a3981ec7ef9e4654962780e8566075)

10 years agoClarify that pts_correction* fields are internal to libavcodec
Michael Niedermayer [Fri, 11 Feb 2011 13:56:03 +0000 (14:56 +0100)]
Clarify that pts_correction* fields are internal to libavcodec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoSet maximum lowres value for the MJPEG decoder to 3.
Carl Eugen Hoyos [Sat, 12 Feb 2011 14:29:10 +0000 (15:29 +0100)]
Set maximum lowres value for the MJPEG decoder to 3.

While 4 works for some samples, 3 is the correct value since 8x8
DCT is used by (m)jpeg.

10 years agoffplay: stats: do not dereference NULL video
Nicolas George [Tue, 8 Feb 2011 10:57:08 +0000 (11:57 +0100)]
ffplay: stats: do not dereference NULL video

Also: cosmetic: split this overly long line

10 years agoVP8: optimized mv prediction and decoding
Jason Garrett-Glaser [Thu, 10 Feb 2011 06:43:25 +0000 (22:43 -0800)]
VP8: optimized mv prediction and decoding

Merge find_near_mvs and mv bitstream decoding: don't do prediction steps
until absolutely necessary.
(cherry picked from commit f3d09d44b70492022964e2ead5f439bb7c96eaa2)

10 years agoac3enc: Remove unneeded clipping of shift amount.
Justin Ruggles [Thu, 10 Feb 2011 22:12:16 +0000 (22:12 +0000)]
ac3enc: Remove unneeded clipping of shift amount.

s->windowed_samples will always have a range of [-32767,32767] due to the
window function, so the return value from log2_tab() will always be in the
range [0,14].

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 626264b11b5406c0c78c4056cabb63cb650e9bf2)

10 years agoac3enc: remove right shifting from lshift_tab() and make lshift unsigned.
Justin Ruggles [Thu, 10 Feb 2011 21:15:01 +0000 (21:15 +0000)]
ac3enc: remove right shifting from lshift_tab() and make lshift unsigned.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d4582889eefeee4dd23face9e74b2829dbaaeae5)

10 years agoasfdec: deobfuscate reading video properties size
Anton Khirnov [Wed, 9 Feb 2011 20:55:56 +0000 (21:55 +0100)]
asfdec: deobfuscate reading video properties size

This code will be later split out into a function which takes a 'size'
argument, so I'm keeping the name 'sizeX' here.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0b1d291a716dd79ca6862a95baf9ac574feba885)

10 years agoasfdec: split asf_read_header()
Anton Khirnov [Wed, 9 Feb 2011 20:55:55 +0000 (21:55 +0100)]
asfdec: split asf_read_header()

Only trivial splits are done here -- i.e. copy/paste + reindent +
missing variable declarations.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c1fea2307011ac7a7bb98af98010f81abc789732)

10 years agowtv: mark streams intended for hearing or visual impaired persons
Peter Ross [Thu, 10 Feb 2011 06:26:10 +0000 (17:26 +1100)]
wtv: mark streams intended for hearing or visual impaired persons

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 68137ba386933243a84fc65f0deb3ad0ce5ff0ea)

10 years agomake av_find_best_stream() ignore streams marked with AV_DISPOSITION_*_IMPAIRED
Peter Ross [Thu, 10 Feb 2011 06:25:40 +0000 (17:25 +1100)]
make av_find_best_stream() ignore streams marked with AV_DISPOSITION_*_IMPAIRED

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 52091491575f015c09a32a745de4f7f7592fe6d4)

10 years agoadd AV_DISPOSITION_HEARING_IMPAIRED and AV_DISPOSITION_VISUAL_IMPAIRED
Peter Ross [Thu, 10 Feb 2011 06:25:13 +0000 (17:25 +1100)]
add AV_DISPOSITION_HEARING_IMPAIRED and AV_DISPOSITION_VISUAL_IMPAIRED

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 12c14cd4a8bf844f6f3d16ae18999bdb47999324)

10 years agoRemove final semicolon from some macros
Mans Rullgard [Thu, 10 Feb 2011 12:04:25 +0000 (12:04 +0000)]
Remove final semicolon from some macros

This avoids double semicolons after macro expansion.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 44adbebe1744c68d66d7f811c38270fdcc89665a)

10 years agodvbsubenc: Fix placement of the object version
Ronen Mizrahi [Thu, 10 Feb 2011 16:50:00 +0000 (11:50 -0500)]
dvbsubenc: Fix placement of the object version

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit df211c3ab73b36208ac4511a9cd7feb817f551fa)

10 years agodocument passing the fate samples location via make variable
Janne Grunau [Thu, 10 Feb 2011 08:57:18 +0000 (09:57 +0100)]
document passing the fate samples location via make variable
(cherry picked from commit 5c19f64c600ece050a1deb27f53963e4416beb31)

10 years agodvbsubdec: check against buffer overreads
Janne Grunau [Wed, 9 Feb 2011 22:23:22 +0000 (23:23 +0100)]
dvbsubdec: check against buffer overreads

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 493aa30adf88baf5bc734072592a22db586f0cfb)

10 years agoDo not fail DVB sub decoding because of a few padding bytes
Reimar Döffinger [Wed, 9 Feb 2011 18:32:07 +0000 (19:32 +0100)]
Do not fail DVB sub decoding because of a few padding bytes

Instead of returning an error when bytes are left over, just return
the number of actually used bytes as other decoders do.
Instead add a special case so an error will be returned when none
of the data looks valid to avoid making debugging a pain.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 4a72765a1c94b05bd3053b1f34f8457a3b71d714)

10 years agoAdd x86-optimized versions of exponent_min().
Justin Ruggles [Thu, 10 Feb 2011 17:20:36 +0000 (12:20 -0500)]
Add x86-optimized versions of exponent_min().

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit dda3f0ef48aa5c3b03566b60b6bf63211e1fe579)

10 years agoRemove incorrect return statement from avcodec_thread_free()
Mans Rullgard [Thu, 10 Feb 2011 12:21:19 +0000 (12:21 +0000)]
Remove incorrect return statement from avcodec_thread_free()

The function return type is void, so a return statement with an
expression is forbidden (and pointless).

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit b4668274b944abae61759e796c5cc36ade510f24)

10 years agoivi_dsp: remove semicolons after function definitions
Mans Rullgard [Thu, 10 Feb 2011 12:04:52 +0000 (12:04 +0000)]
ivi_dsp: remove semicolons after function definitions

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dbb09ec23f16cb5e4ec3d4e0911dae0beb95869b)

10 years agomov: remove stray semicolon
Mans Rullgard [Thu, 10 Feb 2011 11:42:21 +0000 (11:42 +0000)]
mov: remove stray semicolon

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 628b16f45f79aa5eb7514f11026d85e8aa34387f)

10 years agoasfdec: skip the stream bitrate list
Anton Khirnov [Wed, 9 Feb 2011 20:55:52 +0000 (21:55 +0100)]
asfdec: skip the stream bitrate list

Its contents aren't used for anything.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d7a5106eb2dad33765b0e5f11fd8b1a87e5a9b4b)

10 years agoasfdec: use an ASFContext array for storing stream bitrates
Anton Khirnov [Wed, 9 Feb 2011 20:55:54 +0000 (21:55 +0100)]
asfdec: use an ASFContext array for storing stream bitrates

This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 7c7253802bbb4f7330ff9b32358bf05f9880cbdf)

10 years agoasfdec: move DAR list to ASFContext
Anton Khirnov [Wed, 9 Feb 2011 20:55:53 +0000 (21:55 +0100)]
asfdec: move DAR list to ASFContext

This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d42b09723ed154d5269b95efcc20cb1874f60816)

10 years agoudp: Enable address reuse by default for multicast
David Fries [Mon, 7 Feb 2011 21:14:43 +0000 (23:14 +0200)]
udp: Enable address reuse by default for multicast

Keep the original corner case behaviour, where reuse is enabled
for the case where no argument is given to the reuse url option.

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 00952be424ba7403d71c338933354d2172df8e67)

10 years agoasfdec: remove some write-only values from the context
Anton Khirnov [Wed, 9 Feb 2011 20:55:51 +0000 (20:55 +0000)]
asfdec: remove some write-only values from the context

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 569ff02168dfe618599db5d5a327caf8b3051dd5)

10 years agoFix build with threading disabled
Mans Rullgard [Wed, 9 Feb 2011 20:15:25 +0000 (20:15 +0000)]
Fix build with threading disabled

The avcodec_thread_free() compatibility wrapper calls ff_thread_free(),
which is not defined when threading is disabled.  Make this call
conditional.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 9a77a92c2b6855781d2a4cfab14c67ae4025760c)

10 years agow32thread: add missing #include thread.h
Mans Rullgard [Wed, 9 Feb 2011 20:12:57 +0000 (20:12 +0000)]
w32thread: add missing #include thread.h

This should fix building with win32 threads.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aef669cdfd984a737ad876b33ee1b160f87f5f9a)

10 years agoasf: split ASFContext into muxer and demuxer parts.
Anton Khirnov [Tue, 8 Feb 2011 20:46:47 +0000 (21:46 +0100)]
asf: split ASFContext into muxer and demuxer parts.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4bc328a2bdf96d01afd3cf4532efb9db41f00985)

10 years agocheck sample_fmt in avcodec_open
Reimar Döffinger [Wed, 9 Feb 2011 15:52:33 +0000 (10:52 -0500)]
check sample_fmt in avcodec_open

check AVCodecContext->sample_fmt against AVCodec->sample_fmts[] to ensure
that the encoder supports the specified sample format. Error out if it doesn't.
Previously, it would continue and output garbage. Fixes issue 2587.
(cherry picked from commit 2cfa2d925808e6cc6fb7a7c133b7cb7622afd37e)

10 years agompegts: remove unused macro MAX_SCAN_PACKETS
Vladimir Pantelic [Wed, 9 Feb 2011 16:24:23 +0000 (16:24 +0000)]
mpegts: remove unused macro MAX_SCAN_PACKETS

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f4c79d1e0b2e797012304db57903e4091b0c2d7c)

10 years agovp3: Frame-based multithreading support
Alexander Strange [Tue, 8 Feb 2011 02:15:45 +0000 (21:15 -0500)]
vp3: Frame-based multithreading support

Decode times for big_buck_bunny_720p_stereo:

1 thread:
real    1m14.227s
user    1m13.104s
sys     0m1.108s

2 threads: (33% faster)
real    0m49.329s
user    1m33.735s
sys     0m1.834s

3 threads: (44% faster)
real    0m41.593s
user    1m44.884s
sys     0m1.967s
(cherry picked from commit d23845f311f04e98777612cae1b55e28923ccdc6)

10 years agoAdd missing git rev hash.
Ronald S. Bultje [Wed, 9 Feb 2011 12:53:06 +0000 (07:53 -0500)]
Add missing git rev hash.
(cherry picked from commit f2146944fcd00a0a7918931c6f0f5c3f88cd6f1d)

10 years agoDeprecate avcodec_thread_init()
Alexander Strange [Tue, 8 Feb 2011 02:15:45 +0000 (21:15 -0500)]
Deprecate avcodec_thread_init()

As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.

avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.

Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c0b102ca03fe92250f1ce620aec3836f529fc1d6)

10 years agoAdd missing git rev hash.
Ronald S. Bultje [Wed, 9 Feb 2011 12:49:49 +0000 (07:49 -0500)]
Add missing git rev hash.
(cherry picked from commit 8e8cc52be3b515bc91cd9452daca7a65feaea5ad)

10 years agoFrame-based multithreading framework using pthreads
Alexander Strange [Tue, 8 Feb 2011 02:15:44 +0000 (21:15 -0500)]
Frame-based multithreading framework using pthreads

See doc/multithreading.txt for details on use in codecs.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
10 years agoAdd missing git revision hask.
Ronald S. Bultje [Wed, 9 Feb 2011 02:09:47 +0000 (21:09 -0500)]
Add missing git revision hask.
(cherry picked from commit c2bd7578af069206831a9c25fa68c9bbd5004619)

10 years agoasf: make ff_guidcmp inline and move it to asf.h
Anton Khirnov [Wed, 9 Feb 2011 12:27:25 +0000 (12:27 +0000)]
asf: make ff_guidcmp inline and move it to asf.h

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e4e234fad77daa8628fc56155563248165d51ab4)

10 years agoUpdate qmin/qmax values for libx264 presets
Jason Garrett-Glaser [Tue, 8 Feb 2011 23:51:15 +0000 (15:51 -0800)]
Update qmin/qmax values for libx264 presets

Also allow qmin/qmax to go up to 69 (the current max value for libx264).  This
will have to increase when we add 9/10-bit support.
(cherry picked from commit c7ac200d15e3240972d269df768068f0e3bb9c2f)

10 years agoFix broken vbv_buffer_init handling in libx264.c
Jason Garrett-Glaser [Sun, 6 Feb 2011 13:10:15 +0000 (05:10 -0800)]
Fix broken vbv_buffer_init handling in libx264.c

Due to being pants-on-head retarded, libavcodec defaults this to zero, which
results in broken output.  This didn't affect ffmpeg.c, which sets it itself,
but caused problems for other calling apps using VBV.
(cherry picked from commit f7f8120fb9a06b5d7fbf5add48a0d8464319a332)

10 years agoVP8: idct_mb optimizations
Jason Garrett-Glaser [Sun, 6 Feb 2011 05:19:52 +0000 (21:19 -0800)]
VP8: idct_mb optimizations

Currently uses AV_RL32 instead of AV_RL32A, as the latter doesn't exist yet.
(cherry picked from commit 62457f9052ea15123688455aad866cb070634f13)

10 years agoFix ff_emu_edge_core_sse() on Win64.
Ronald S. Bultje [Tue, 8 Feb 2011 20:56:32 +0000 (15:56 -0500)]
Fix ff_emu_edge_core_sse() on Win64.

Fix emu_edge_v_extend_15 to be <128 bytes on Win64, by being more strict
on the size of registers and which registers are being used for operations
where multiple are available. This fixes segfaults in emulated_edge()
function calls on Win64.
(cherry picked from commit 17cf7c68ed26a4cb3c7adf7488a38c2e19118918)

10 years agolavf: rename ff_probe_input_buffer to make it public
Anssi Hannula [Mon, 7 Feb 2011 22:46:53 +0000 (00:46 +0200)]
lavf: rename ff_probe_input_buffer to make it public

It is useful for applications that hand input data directly to lavf via
a ByteIOContext.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 3940caad02fbc4f075e77bc605849b1d84ba1b8e)

10 years agolavf: simplify pb parameter of ff_probe_input_buffer
Anssi Hannula [Mon, 7 Feb 2011 22:46:52 +0000 (00:46 +0200)]
lavf: simplify pb parameter of ff_probe_input_buffer

There is no need to pass the ByteIOContext via a pointer to a pointer
anymore.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit aad216fd7e3209fe0a865d8751e680925f6654d3)

10 years agolavf: update ff_probe_input_buffer documentation
Anssi Hannula [Mon, 7 Feb 2011 22:46:51 +0000 (00:46 +0200)]
lavf: update ff_probe_input_buffer documentation

It never reopens the bytestream anymore.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4d016dd4e5b288b3c0c7396935326cb07a289ac2)

10 years agooggdec: Fix incorrect assumption about header/data interleaving
Reimar Döffinger [Sat, 5 Feb 2011 16:32:35 +0000 (16:32 +0000)]
oggdec: Fix incorrect assumption about header/data interleaving

Currently (since the data_offset fix) the ogg demuxer assumes that
after the first non-header packets in any stream no more header packets
will follow.
This is not guaranteed, so change the code back again to wait until it
has finished the headers for all streams before returning from ogg_get_headers.

This fixes issue 2428.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6bd69e6adadf645fd07e909bebc150eab4b9c3c8)

10 years agoFix HOSTLIBS on Haiku
François Revol [Tue, 8 Feb 2011 21:09:44 +0000 (21:09 +0000)]
Fix HOSTLIBS on Haiku

Haiku does not have a separate libm, so do not try to link to it.

Signed-off-by: François Revol <revol@free.fr>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f59c4bd625839dbe1e099c6a8b38988108883623)

10 years agoDocumentation updates for the git migration
Reinhard Tartler [Mon, 7 Feb 2011 16:17:30 +0000 (17:17 +0100)]
Documentation updates for the git migration

This cleanup patch updates the developer documentation with respect to
the migration to the git scm.
(cherry picked from commit 87800dc2bf8f2724a99e51bb079ad7fb4b9dfd3b)

10 years agologging: downgrade recoverable errors to warnings
Stefan Kost [Tue, 8 Feb 2011 12:16:49 +0000 (14:16 +0200)]
logging: downgrade recoverable errors to warnings

In all 3 cases, the decoding continues and thus a warning would be sufficient.
Helps application that catch them with own log handers to handle them
accordingly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit ae2104791ffa8466d3f6972ed0793b2a165daabe)

10 years agoadd APIChanges entry for fe9a3fb
Janne Grunau [Tue, 1 Feb 2011 21:09:12 +0000 (22:09 +0100)]
add APIChanges entry for fe9a3fb
(cherry picked from commit 7ab8758baf743b3d525c07a770e13038b0885461)

10 years agoh264: define FF_PROFILE_H264_HIGH_444 to the correct value
Janne Grunau [Tue, 1 Feb 2011 20:56:13 +0000 (21:56 +0100)]
h264: define FF_PROFILE_H264_HIGH_444 to the correct value

It was removed in fe9a3fb since it had the wrong value. Add profile name
for it.
(cherry picked from commit 440b61691db2166abac3f58e01da1d4722f1f1e4)

10 years agolibavfilter: add video movie source
Stefano Sabatini [Sat, 29 Jan 2011 10:22:41 +0000 (11:22 +0100)]
libavfilter: add video movie source

See thread:
Subject: [PATCH] movie video source
Date: 2010-12-31 15:35:30 GMT

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
10 years agoApply misc fixes to the image2 muxer documentation.
Stefano Sabatini [Wed, 2 Feb 2011 23:49:07 +0000 (00:49 +0100)]
Apply misc fixes to the image2 muxer documentation.

The fixes were pointed out by Diego.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 0cad24ce9b02037c9cdad84cae905f96b04d7d4c)

10 years agoAdd documentation for the framecrc muxer.
Stefano Sabatini [Tue, 1 Feb 2011 00:03:48 +0000 (01:03 +0100)]
Add documentation for the framecrc muxer.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 77d4ed7a127b88f9b8ddd741c65e678198feb285)

10 years agoAdd documentation for the crc muxer.
Stefano Sabatini [Mon, 31 Jan 2011 14:20:09 +0000 (15:20 +0100)]
Add documentation for the crc muxer.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a4effe432f4aa59d52465b88589f92addf3afd3e)

10 years agoDocument null muxer.
Stefano Sabatini [Mon, 31 Jan 2011 14:01:46 +0000 (15:01 +0100)]
Document null muxer.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit f4acb837eb4af74996b678f3f55eaa66c47a66ee)

10 years agoVP8: ARM NEON optimisations for dsp functions
Mans Rullgard [Wed, 2 Feb 2011 16:26:20 +0000 (16:26 +0000)]
VP8: ARM NEON optimisations for dsp functions

This adds NEON optimised versions of all functions in VP8DSPContext.
Based on initial work by Rob Clark.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a1c1d3c003b0ec16fdb6574913781313fb2c7ab6)

10 years agoRemove Xan WC4 cruft from xan.c
Kostya [Thu, 3 Feb 2011 09:06:12 +0000 (10:06 +0100)]
Remove Xan WC4 cruft from xan.c

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 90e8a9c34f641d0cb9137190c1912a3da3095e01)

10 years agoXan4 decoder
Kostya Shishkov [Fri, 4 Feb 2011 22:41:07 +0000 (23:41 +0100)]
Xan4 decoder

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 44ddfd47d671d2587903d94c8b565f68f45bd4bc)

10 years agomatroskadec: add generic element length validation.
Reimar Döffinger [Sun, 6 Feb 2011 10:32:03 +0000 (11:32 +0100)]
matroskadec: add generic element length validation.

This validate the length of a mkv element directly after reading
it.
This has the advantage that it is easy to add new limits and makes
it less likely to forget to add checks and also avoids issues like
bits of the length value above the first 32 being ignored because
the parsing functions only takes an int.
Previously discussed in the "mkv 0-byte integer parsing" thread.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 95ec3d4cacd084e2448c3a1aba420e7d8f00e19b)

10 years agoFix compile warning.
Ronald S. Bultje [Mon, 7 Feb 2011 01:33:53 +0000 (20:33 -0500)]
Fix compile warning.

Change int64_t into a int, which caused this compiler warning:
libavformat/oggparseskeleton.c:64: warning: passing argument 2 of ‘av_reduce’ from incompatible pointer type
(cherry picked from commit 69ff14920429c9e128a8bcf65ce3f4b4aa93f3d1)

10 years agoavidec: simplify read_gab2_sub
Anton Khirnov [Sun, 6 Feb 2011 09:59:54 +0000 (10:59 +0100)]
avidec: simplify read_gab2_sub

Use avio functions instead of bytestream ones (also drops dependency on
lavc and removes a bunch of warnings).
Drop custom version of avio_get_str16 and use that instead.

Tested on mewmew-ssa.avi sample.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 47fdf00a77e82a0e30422ed08d5b295e9ae8d506)

10 years agolavf: move internal functions from avformat.h to internal.h
Anton Khirnov [Sun, 6 Feb 2011 14:38:55 +0000 (15:38 +0100)]
lavf: move internal functions from avformat.h to internal.h

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 19711af5cdc364f9e02ea8103dd6e1e09dc288a4)

10 years agoMake av_set_pts_info keep previous time base if new one is invalid.
Reimar Döffinger [Sun, 6 Feb 2011 14:27:30 +0000 (15:27 +0100)]
Make av_set_pts_info keep previous time base if new one is invalid.

Fixes issue 2475.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b3190529dfefe3226302b23e76e16c631cde6649)

10 years agopass QDMC extradata to the decoder
Sascha Sommer [Sun, 6 Feb 2011 12:54:03 +0000 (13:54 +0100)]
pass QDMC extradata to the decoder

Makes playing QDMC files in MPlayer work when using the libavformat demuxer.
Problem was that the extradata was not passed from demuxer to decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ed19fafd486d6ab0d6e1eba80ceaa482a740c556)

10 years agoconfigure: check yasm/nasm for working pextrd opcode
Anssi Hannula [Sun, 6 Feb 2011 05:58:02 +0000 (07:58 +0200)]
configure: check yasm/nasm for working pextrd opcode

NASM versions older than 2.08 fail to build ffmpeg with several
"error: operation size not specified" errors but this is not caught in
configure.

Fix that by checking if "pextrd [eax], xmm0, 1" works in configure.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 48545a8f724247853c5b1d4e0a24e3ea3ee06515)

10 years agovorbis dec: Remove obsolete comment
Alexander Strasser [Mon, 7 Feb 2011 23:09:48 +0000 (00:09 +0100)]
vorbis dec: Remove obsolete comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agovorbis dec: cosmetics: Indent CPP cond properly
Alexander Strasser [Mon, 7 Feb 2011 23:09:34 +0000 (00:09 +0100)]
vorbis dec: cosmetics: Indent CPP cond properly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agovorbis dec: cosmetics: Indent consistently
Alexander Strasser [Mon, 7 Feb 2011 23:09:01 +0000 (00:09 +0100)]
vorbis dec: cosmetics: Indent consistently

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agovorbis dec: cosmetics: Indent after scope deletion
Alexander Strasser [Mon, 7 Feb 2011 23:08:39 +0000 (00:08 +0100)]
vorbis dec: cosmetics: Indent after scope deletion

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agovorbis dec: Delete useless scopes
Alexander Strasser [Mon, 7 Feb 2011 23:07:47 +0000 (00:07 +0100)]
vorbis dec: Delete useless scopes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoImplement guessed_pts in avcodec_decode_video2
Nicolas George [Sun, 30 Jan 2011 19:18:31 +0000 (20:18 +0100)]
Implement guessed_pts in avcodec_decode_video2

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodvdsubdec.c: prevent input buffer overflow
Jindrich Makovicka [Sat, 5 Feb 2011 10:39:51 +0000 (11:39 +0100)]
dvdsubdec.c: prevent input buffer overflow

In some places, dvbsubdec passes improper input buffer size to
bitstream reading functions, not accounting for reading pointer
updates.

Fixed by using buffer_end - buffer pointer instead of fixed buffer length.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMake inter_rvlc and intra_rvlc static tables.
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:19 +0000 (00:36 +0100)]
Make inter_rvlc and intra_rvlc static tables.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 84ae8936f642042fe7ad3466ce3a26dec77016f1)

10 years agoFill in missing date.
Ronald S. Bultje [Sun, 6 Feb 2011 14:46:32 +0000 (09:46 -0500)]
Fill in missing date.
(cherry picked from commit ae0f8a1a33158397c5014745424389ba1f543cfd)

10 years agoUpdate MINOR and set git rev for non-blocking flag API addition.
Ronald S. Bultje [Sun, 6 Feb 2011 14:19:34 +0000 (09:19 -0500)]
Update MINOR and set git rev for non-blocking flag API addition.
(cherry picked from commit efdd67cb00ad770c16c47161c023121e1ae53ae9)

10 years agoReplace remaining occurrences of deprecated CH_* with AV_CH_*
Anton Khirnov [Thu, 3 Feb 2011 13:26:09 +0000 (14:26 +0100)]
Replace remaining occurrences of deprecated CH_* with AV_CH_*

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c2fcd0a7a4d0bda1a3306e40b70ce281a987df60)

10 years agoNon-blocking protocol: TCP
Nicolas George [Fri, 4 Feb 2011 18:12:38 +0000 (19:12 +0100)]
Non-blocking protocol: TCP

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ad3cffb68f9c77e140660a8ae7d43c8606208178)

10 years agoNon-blocking protocol: core wrapper functions
Nicolas George [Fri, 4 Feb 2011 18:12:37 +0000 (19:12 +0100)]
Non-blocking protocol: core wrapper functions

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 90441276e4f661c6aec5e4d2c5718cde1ff1946d)

10 years agoNon-blocking protocols: flag and documentation
Nicolas George [Fri, 4 Feb 2011 18:12:36 +0000 (19:12 +0100)]
Non-blocking protocols: flag and documentation

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit fe174fc8fc4bbdb050014a945de7eb9b28ba358e)

10 years agoSet channel_layout for mpegaudio
Kieran Kunhya [Sat, 5 Feb 2011 17:59:48 +0000 (17:59 +0000)]
Set channel_layout for mpegaudio

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f4a86bc981d6743778dd1037fea243d36229ede1)

10 years agomp3enc: write ISO8859-1 instead of UTF-16 when possible
Anton Khirnov [Sat, 5 Feb 2011 21:20:13 +0000 (22:20 +0100)]
mp3enc: write ISO8859-1 instead of UTF-16 when possible

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 5a6de4e7e8d81169be9b6909b71e42a9ece59a82)

10 years agoreindent after last commit
Peter Ross [Sat, 5 Feb 2011 01:10:32 +0000 (12:10 +1100)]
reindent after last commit

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 74571e333cc9abf3fe3fde3735698def1547db71)

10 years agowtv: do not use flag in stream_guid chunk to determine if stream is valid, as this...
Peter Ross [Sat, 5 Feb 2011 01:10:10 +0000 (12:10 +1100)]
wtv: do not use flag in stream_guid chunk to determine if stream is valid, as this method is unreliable

This fixes roundup issue 2556.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e4f85b849913794395bb03dfc09546cd41b10882)

10 years agovp3: Move table allocation code into a new function
Alexander Strange [Sat, 5 Feb 2011 05:28:28 +0000 (00:28 -0500)]
vp3: Move table allocation code into a new function

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit edbb0c07081e78a4c7b6d999d641183bf30f1a2e)

10 years agovp3: Factor out expression
Alexander Strange [Sat, 5 Feb 2011 05:28:27 +0000 (00:28 -0500)]
vp3: Factor out expression

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e8dcd730583a0aa69c33a17fc27d65fa55f5effe)

10 years agocmdutils: fix codec-specific options from preset
James Zern [Sat, 5 Feb 2011 02:29:46 +0000 (18:29 -0800)]
cmdutils: fix codec-specific options from preset

Using a preset file caused the address of a stack variable to be stored
in opt_names/values. This change causes the strings to be dup'd then
freed in uninit_opts.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 60ff9de6ffa740e0df8c2a019c72e2d332b9788d)

10 years agocmdutils: fix opt_values leak
James Zern [Sat, 5 Feb 2011 01:58:03 +0000 (17:58 -0800)]
cmdutils: fix opt_values leak

Add free to uninit_opts and relocate opt_names to same

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 3a6a9cdf5b8e4c4514e483484ef1f57b07ee16f2)

10 years agoAdopt pkt_dts/pkt_pts in lavc clients
Alexander Strange [Sat, 5 Feb 2011 05:28:24 +0000 (00:28 -0500)]
Adopt pkt_dts/pkt_pts in lavc clients

No behavior change; this makes DTS reliable with the next patch.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b474953975fd8ea64d1ed4d09c42b2d8e787c6f)

10 years agoapplehttp: Handle absolute paths relative to the current server
Martin Storsjö [Fri, 4 Feb 2011 09:09:48 +0000 (11:09 +0200)]
applehttp: Handle absolute paths relative to the current server

This fixes roundup issue 2583.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 185a155e5701cfaa0281bf91a5a140d498aa0a7f)

10 years agomovenchint: Use rtpenc_chain for setting up the chained RTP muxer
Martin Storsjö [Fri, 4 Feb 2011 10:04:20 +0000 (12:04 +0200)]
movenchint: Use rtpenc_chain for setting up the chained RTP muxer

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 5306bf41a619cb757ef0e0092ea4f6bc1087e687)

10 years agortpenc_chain: Don't copy the time_base back to the caller
Martin Storsjö [Fri, 4 Feb 2011 10:04:19 +0000 (12:04 +0200)]
rtpenc_chain: Don't copy the time_base back to the caller

If required, the caller can do this itself. ff_write_chained rescales
timestamps as necessary, and all current callers of rtpenc_chain
use ff_write_chained, making this timebase copy unnecessary.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 397ffde115f4e0482a007b672f40457596cebfc4)

10 years agoUse avformat_free_context for cleaning up muxers
Martin Storsjö [Fri, 4 Feb 2011 10:04:18 +0000 (12:04 +0200)]
Use avformat_free_context for cleaning up muxers

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b22dbb291d41e9fb038884bcebad2394c501cbaf)

10 years agoAdd an APIchanges entry for avformat_free_context
Martin Storsjö [Fri, 4 Feb 2011 10:04:17 +0000 (12:04 +0200)]
Add an APIchanges entry for avformat_free_context

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ff1974897778942180c1d4f95b0b7b45a4fbbc02)

10 years agolibavformat: Add a function for freeing an AVFormatContext
Martin Storsjö [Fri, 4 Feb 2011 10:04:16 +0000 (12:04 +0200)]
libavformat: Add a function for freeing an AVFormatContext

This function is useful for freeing data structures allocated by
muxers, which currently have to be freed manually by the caller.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f124b087eea442b65d809582527dfb5092a3463c)

10 years agolibavformat: Use avcodec_copy_context for chained muxers
Martin Storsjö [Fri, 4 Feb 2011 10:04:15 +0000 (12:04 +0200)]
libavformat: Use avcodec_copy_context for chained muxers

This avoids having the chained AVStream->codec point to the same
AVCodecContext owned by the outer AVStream. The downside is that
changes to the AVCodecContext made after calling av_write_header
cannot be detected automatically within the chained muxer.

This avoids having to manually unlink the chained AVStream->codec
by setting it to null before freeing the chained muxer via generic
freeing functions.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1338dc082354b87c0e26f7f2ab09df5964b7f993)

10 years agoVP8: slightly faster loopfilter sharpness logic
Jason Garrett-Glaser [Fri, 4 Feb 2011 07:37:30 +0000 (23:37 -0800)]
VP8: slightly faster loopfilter sharpness logic
(cherry picked from commit 8a2c99b48688008dd0a01c4826161ad4f7c25436)

10 years agoVP8: faster deblock strength calculation
Jason Garrett-Glaser [Fri, 4 Feb 2011 06:48:53 +0000 (22:48 -0800)]
VP8: faster deblock strength calculation

Convert hev_thresh logic to a LUT, simplify mbedge_lim calculation.
(cherry picked from commit 79dec1541bf83fb587aee9a002649ad1fe038990)

10 years agoRemove forgotten if (p) av_free(p) forms
Clément Bœsch [Thu, 3 Feb 2011 10:31:41 +0000 (11:31 +0100)]
Remove forgotten if (p) av_free(p) forms

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 290849e2a4e76484f1a34506782e8dbfe7bbe406)