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

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 0b1d291a)

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 c1fea230)

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

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

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

This avoids double semicolons after macro expansion.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 44adbebe)

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

(cherry picked from commit 5c19f64c)

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

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 4a72765a)

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

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 b4668274)

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

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

Its contents aren't used for anything.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d7a5106e)

This will be useful for splitting asf_read_header()
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 7c725380)

This will be useful for splitting asf_read_header()
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d42b0972)

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 00952be4)

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

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 9a77a92c)

This should fix building with win32 threads.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aef669cd)

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

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 2cfa2d92)

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

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 d23845f3)

(cherry picked from commit f2146944)

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 c0b102ca)

(cherry picked from commit 8e8cc52b)

See doc/multithreading.txt for details on use in codecs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

(cherry picked from commit c2bd7578)

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

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 c7ac200d)

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 f7f8120f)

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

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 17cf7c68)

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 3940caad)

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 aad216fd)

It never reopens the bytestream anymore.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4d016dd4)

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 6bd69e6a)