27770 Commits

Author SHA1 Message Date
Jason Garrett-Glaser
d14723861b VP3: fix decoding of videos with stride > 2048
Also remove qscale_table code; this didn't make sense anyways as VP3 doesn't
use an MPEG-like quantizer scale.
(cherry picked from commit 902685b8abf4e2089802528a32a50f3c68033fda)
2011-02-20 19:05:44 +01:00
Michael Niedermayer
5c20c81bfa Fix issue2619.
regression introduced in 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-19 17:31:10 +01:00
Jean-Daniel Dupas
7782cb207a targa: fix potential buffer overreads
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 351423ae1f861da1c647d30c73503fde2b1f3dad)
2011-02-18 19:52:41 +01:00
Ronald S. Bultje
56cbc5f19f Fix PPC build.
(cherry picked from commit ed040f35f298b39f1ddd45a133c82cb5d6d79dda)
2011-02-18 19:52:41 +01:00
Jason Garrett-Glaser
1d37e908cf VP8: init one less near_mv
This one didn't actually need to be initialized.
(cherry picked from commit 891b1f15a7e45a2a5f91cb4c27d11259ef8e012f)
2011-02-18 19:52:41 +01:00
Jason Garrett-Glaser
545dc699f8 Force inlining of avutil common routines
On some versions of gcc, these weren't always getting inlined due to hitting
the inline cap limit in some files.  This is generally bad, as most of these
functions are smaller inlined than not.
(cherry picked from commit eb3755a5aa65da685d81399cfae4bd35e4a178b6)
2011-02-18 19:52:41 +01:00
Jason Garrett-Glaser
8e624c1cee VP8: split out declarations to new header
(cherry picked from commit bcf4568f183055331415ba230e82af6d59faac1c)
2011-02-18 19:52:41 +01:00
Jason Garrett-Glaser
625e9309da VP8: faster MV clipping
(cherry picked from commit 7634771e70575b2a5abaeb420c5b3c2f9948c693)
2011-02-18 19:52:40 +01:00
Ronald S. Bultje
9a1ced321b dsputil: move VC1-specific stuff into VC1DSPContext.
(cherry picked from commit 12802ec0601c3bd7b9c7a2503518e28fd5e7d744)
2011-02-18 19:52:40 +01:00
Ronald S. Bultje
6c0d9369d8 VC1: simplify a calculation in a loop.
(cherry picked from commit 0b16cdc3fa1d73056649abf43288be0a7624fdcc)
2011-02-18 19:52:39 +01:00
Ronald S. Bultje
2739dc5d85 VC1: transpose IDCT 8x8 coeffs while reading.
(cherry picked from commit 1da6ea39542424ddb691dc6cf08d611a4c6db247)
2011-02-18 19:52:38 +01:00
Martin Storsjö
003c32e72c ffserver: Try matching the RTSP url without a trailing slash
If the client sends PLAY/PAUSE requests with the same url as
specified in Content-Base, these requests may have urls with
trailing slashes.
(cherry picked from commit c2ca851b234e169b50730ef357aeade8047491eb)
2011-02-18 19:52:36 +01:00
Janne Grunau
b2f893acc8 Add SHA1s to APIChanges for av_dump_format, av_parse_time and av_find_info_tag
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit c3dbfa1afd7d989e3bba4c6bfc492a52c012e9b3)
2011-02-18 19:52:36 +01:00
Anton Khirnov
0ef52334ec lavf, lavu: bump minor versions and add an APIChanges entry for av_ prefixes
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 09d171b98879f58be1a766d5f277e131b18e98a1)
2011-02-18 19:52:34 +01:00
Anton Khirnov
1b98107c8d Move find_info_tag to lavu and add av_ prefix to it
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit ab0287fcbdebc8ff416214535d7ee8424406990e)
2011-02-18 19:52:33 +01:00
Young Han Lee
9c9912b995 mdct: remove unnecessary multiplication
3*n4 was already calculated in n3.
(cherry picked from commit 979395bbbb9381b522b44c3448c24aef9c819ffc)
2011-02-18 19:52:33 +01:00
Justin Ruggles
6159bd0d67 ac3enc: fix bug in stereo rematrixing decision.
The rematrixing strategy reuse flags are not reset between frames, so they
need to be initialized for all blocks, not just block 0.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 5b54d4b376fbd2c291b8a6dba7d425e28f654bcf)
2011-02-18 19:52:32 +01:00
Anton Khirnov
ee60e04c2c Replace remaining uses of parse_date with av_parse_time.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 9fcae9735e3b97366dcee9ca3c2f6cf4faf6756f)
2011-02-18 19:52:31 +01:00
Stefano Sabatini
40c3fe2c08 Deprecate parse_date() in favor of av_parse_time().
The new av_parse_time() is created in libavutil/parseutils.h, all the
internal functions used by parse_date are moved to
libavutil/parseutils.c and made static.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f6c7375a175ac649558aefab14f3895b2cb469aa)
2011-02-18 19:52:30 +01:00
Anton Khirnov
0ebf475494 lavf: add av_ prefix to dump_format()
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)
2011-02-18 19:52:28 +01:00
Martin Storsjö
09e22efc7e rtsp: udp_read_packet returning 0 doesn't mean success
If udp_read_packet returns 0, rtsp_st isn't set and we shouldn't
treat it as a successfully received packet (which is counted and
possibly triggers a RTCP receiver report).

This fixes issue 2612.
(cherry picked from commit 2c35a6bde95a382e2d48570255deb67a7633fa46)
2011-02-18 19:52:26 +01:00
Nicolas George
34c340d49f ffserver: set the sample aspect ratio
Hi.

It seems that ffserver sets sample_aspect_ratio to an invalid value and lavf
rejects it.

I am not sure what I am doing here, but the attached patch actually solves
something: using the following config:

CustomLog -
NoDaemon
RTSPPort 5454
<Stream test1-rtsp.mpg>
Format rtp
File "/tmp/test1-rtsp.mpg"
</Stream>

it allows a somewhat old ffplay (unaffected by the content-base issue I
spoke of in another thread) to play the stream.

Without it, ffserver logs this and closes the stream:

Wed Feb 16 14:52:14 2011 [rtp @ 0x1399de0]Aspect ratio mismatch between encoder and muxer layer

Regards,

--
  Nicolas George

From 1b89c3c2164335060e87567b27deb0d354e0a814 Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Wed, 16 Feb 2011 14:44:31 +0100
Subject: [PATCH] ffserver: set the sample aspect ratio.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
(cherry picked from commit 6741f7c9be4913e084ad067571f3f29853ec5d5a)
2011-02-18 19:52:26 +01:00
James Zern
728d56e84f documentation: add encoders chapter
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 0fa904c9d845d4a47372e619067e21991bb39b06)
2011-02-18 19:52:25 +01:00
Stefano Sabatini
5d329e2eb7 In graph2dot, print more specific audio information for audio links.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 009026efb1e3b3a5f05fd9934019a6300b25f364)
2011-02-18 19:52:25 +01:00
Anssi Hannula
2613c81182 spdifenc: set flag AVFMT_NOTIMESTAMPS
There are no timestamps in IEC 61937.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 6c60fcf89afc84c9dc863669d78e611d7c72fe41)
2011-02-18 19:52:25 +01:00
Michael Niedermayer
02d0803571 Reduce picture size for yadif.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-18 19:39:56 +01:00
Michael Niedermayer
bad82d3d7d Change yadif to not use out of picture lines.
Fixes issue2272.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-18 19:39:42 +01:00
Justin Ruggles
20a2a3da8f ac3dsp: Change punpckhqdq to movhlps in ac3_max_msb_abs_int16().
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1f004fc512babe8215e2aa31fa4770aa27812cab)
2011-02-16 23:00:50 +01:00
Maksym Veremeyenko
c4461aa83c fix nsvdec.c compilation if DEBUG macro defined
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 41cdc1ff1e86f1bfb935e1bde53ccc9c645ff71e)
2011-02-16 23:00:50 +01:00
Balint Marton
33af787d8a Fix av_find_best_stream when using a program
The current implementation has a bug, it is returning the stream index
in the found program, and not the stream index in the list of all
streams. The attached patch fixes this issue.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 22ec6b738f1608e4b959fb655cf37c3343ec7e9f)
2011-02-16 23:00:50 +01:00
Stefano Sabatini
20bc55ce5c Document audio_resample_close().
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-16 23:00:50 +01:00
Reimar Döffinger
438198e795 Document that av_write_header sets stream time_base to a value of it chosing.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-16 23:00:49 +01:00
Janne Grunau
fabb93e397 spdifenc: update 482d98f69b2eb7a7b0b5054101a43db384e9432b to the latest patch
"spdifenc: IEC 61937 encapsulation of DTS-HD for HDMI"
(cherry picked from commit ec25f83bd98e10c023e6c7b07da1dcfc4d80cefc)
2011-02-16 23:00:49 +01:00
Justin Ruggles
660ab0e64d ac3enc: change default floor code to 7.
This is to match the value in every (E-)AC-3 file from commercial sources.
It has a negligible effect on audio quality.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 50d7140441b61809ad4ba4ea7b4ad8fe77bc6888)
2011-02-16 23:00:49 +01:00
Max Shakhmetov
a41aebf153 os_support: fix poll() implementation
Our poll implementation does not iterate over the pollfd array properly
while setting the revents.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 9ac2085dbf1821b7995fe360038c1bf0f3940032)
2011-02-16 23:00:49 +01:00
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Michael Niedermayer
fad8143f5b vbv_delay AVOption for ABI compatibility
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-16 02:10:05 +01:00
Mans Rullgard
2f6c6a3462 APIchanges: update for 55bad0c: vbv_delay
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 8ed4cc65a19b5a6cc7ae6ed5072be2d3836dbeb2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-16 02:08:13 +01:00
Christophe Massiot
b6d0700058 Pass VBV delay to the calling application via ctx
VBV delay is useful for T-STD compliance in some TS muxers. It is
certainly possible to retrieve it by parsing the output of FFmpeg, but
getting it from the context makes it simpler and less error-prone.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-16 02:07:51 +01:00
Peter Ross
c4c9fb4690 binkaudio: remove unused copy of AVCodecContext*
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 71f88b1f3843fdb676d6f72181da0c8c460341d8)
2011-02-15 16:32:33 +01:00
Peter Ross
136901567c binkaudio: fix channel count check
Perform validity check on AVFormatContext.channels instead of
uninitialised field.

This fixes issue 2001.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 9806fbd5351fa84f99fa5b18fe06859acb514f34)
2011-02-15 16:32:33 +01:00
Maksym Veremeyenko
73b3b52285 fix nsvdec.c compilation if DEBUG defined
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d06497f316ed819ea0ca0fad2535342ec42c79a5)
2011-02-15 16:32:33 +01:00
Young Han Lee
ece6cca14a aacdec: Implement LTP support.
Ported from gsoc svn.
(cherry picked from commit ead15f1dc196ad164d105e31c8c9025f8a4ee4e7)
2011-02-15 16:32:33 +01:00
Anssi Hannula
d3c4829a0d APIchanges: update for 12c14cd
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 77c330a046d668373cbd9542f3e1d4746916b02f)
2011-02-15 16:32:32 +01:00
Mans Rullgard
5c878d4b1c mpegtsenc: whitespace cosmetics
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2dd1ee4bfe85f41b771bf8fe1c2cfa2d833b5de3)
2011-02-15 16:32:32 +01:00
Anssi Hannula
932a45a594 mpegtsenc: set audio_type according to st->disposition
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3f2d3a1904c1ccdfdc3bd03a6dd6567986f681d9)
2011-02-15 16:32:32 +01:00
Anssi Hannula
e2db6b590f mpegts: set st->disposition according to ISO 639 language descriptor
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 60e7306643054e93dfc1962f89b24554bb76e18a)
2011-02-15 16:32:32 +01:00
Mans Rullgard
3c9fcab554 apichanges: update for 24a83bd: add AV_DISPOSITION_CLEAN_EFFECTS flag
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 935ee1b9bba3d2fa1bf0d48eef278956307478cb)
2011-02-15 16:32:32 +01:00
Anssi Hannula
2ea7e1f011 lavf: add AV_DISPOSITION_CLEAN_EFFECTS flag
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 24a83bd10a1ed56cadd2c475b839887752f23183)
2011-02-15 16:32:31 +01:00
Michael Niedermayer
e24c05cd53 Better threshold for the gcd based r_frame_rate calculation.
Fixes Gilmore Girls_Net 5_2011_01_08_16_10_53.wtv and RTL GP- WK Superbike - Qatar_RTL7_2009_03_14_15_49_23.wtv.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-15 04:19:31 +01:00