Michael Niedermayer
59a58884b9
ffplay: Copy audio side data too. This fixes handling of some rare nellymoser files that change the sample rate mid stream (sample file at: http://trac.videolan.org/vlc/ticket/5586 )
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
2011-12-01 20:55:01 +01:00
Mans Rullgard
3adba2de3d
ARM: fix indentation in ff_dsputil_init_neon()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-01 19:41:36 +00:00
Mans Rullgard
96fef6cf31
ARM: NEON put/avg_pixels8/16 cosmetics
...
This makes whitespace and register names consistent with
the style used in more recent code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-01 19:41:36 +00:00
Mans Rullgard
716f1705e9
ARM: add remaining NEON avg_pixels8/16 functions
2011-12-01 19:41:36 +00:00
Mans Rullgard
94267ddfb2
ARM: clean up NEON put/avg_pixels macros
...
Although this adds a few lines, the macro calls are less convoluted.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-01 19:41:35 +00:00
Michael Niedermayer
4a8e3324fb
libx264: fix generic boolean support
...
Fixes Ticket660
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 20:38:14 +01:00
Justin Ruggles
ca12401376
fate: split acodec-pcm into individual tests
...
this removes 2 redundant tests for pcm in mkv.
we can add the coverage back in later as fate-lavf tests if needed.
2011-12-01 13:27:56 -05:00
Reinhard Tartler
5089ce1b5a
swscale: #include "libavutil/mathematics.h"
...
this file uses the M_PI macro since
4e74187db2
, so include the correct header
directly.
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-12-01 19:12:26 +01:00
Michael Niedermayer
b50be4e38d
vc1_parser: fix NULL pointer dereference
...
Fixes Ticket456
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 18:46:22 +01:00
Carl Eugen Hoyos
d9cc6bb432
Support ffmpeg -dn to disable copying data streams.
...
Fixes ticket #647 .
2011-12-01 18:02:04 +01:00
Michael Niedermayer
3e1951e8f4
h264: More restrictive more_rbsp_data_in_pps()
...
Fixes Ticket697
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 17:28:46 +01:00
Anton Khirnov
74e96eb77e
pmpdec: don't use deprecated av_set_pts_info.
2011-12-01 17:28:36 +01:00
Mans Rullgard
37fed0e635
rv34: align temporary block of "dct" coefs
...
This is needed for optimised transforms.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-01 14:29:29 +00:00
Peter Ross
f3f488423a
pictordec: prevent segfault when reading corrupted files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 14:35:46 +01:00
Peter Ross
43a2a8b4a3
pictordec: use correct context for another av_log
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 14:34:46 +01:00
Reimar Döffinger
f28070a123
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.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-12-01 13:54:43 +01:00
Martin Storsjö
c3b05d2159
proto: Realign struct initializers
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-01 13:47:28 +02:00
Martin Storsjö
7e58050590
proto: Use .priv_data_size to allocate the private context
...
This simplifies the open functions by avoiding one function
call that needs error checking, reducing the amount of
extra bulk code.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-01 13:47:26 +02:00
Martin Storsjö
9c6777bd93
mmsh: Properly clean up if the second ffurl_alloc failed
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-01 13:47:26 +02:00
Martin Storsjö
02490bf358
rtmp: Clean up properly if the handshake failed
...
This prevents memory leaks if this function returns an error.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-01 13:47:25 +02:00
Martin Storsjö
6af354436c
md5proto: Remove the get_file_handle function
...
The private data pointer isn't a file handle, this protocol
doesn't have any file handle to return.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-01 13:47:24 +02:00
Martin Storsjö
1ca87d600b
applehttpproto: Use the close function if the open function fails
...
This should clean up leaked memory.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-01 13:47:23 +02:00
Martin Storsjö
abe20c59b9
http: Make sure proxyauth is initialized
...
This string will be passed to ff_http_auth_create_response
even if no proxy is used, resulting in reading uninitialized
memory. The other auth string is always initialized by
av_url_split.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-01 12:05:14 +02:00
Michael Niedermayer
adfdcf87b1
vble: use dsp.add_hfyu_median_prediction() this allows asm optimizations to be used.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-30 21:06:32 -08:00
Michael Niedermayer
317ea97bff
vble: remove flags copy, its not used in any speed relevant code.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-30 21:06:15 -08:00
Derek Buitenhuis
e46abbcf77
vble: merge len and val arrays
...
There's no reason to use two arrays for this.
Based off commit 2fea60c600
to FFmpeg by Michael Niedermayer.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-30 21:05:55 -08:00
Michael Niedermayer
0dd704dbd4
vble: remove unused variable len.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-11-30 21:05:31 -08:00
Michael Niedermayer
67eb95ce15
ffmpeg: fix segfault with ffmpeg -h
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 04:32:27 +01:00
Michael Niedermayer
03b60509cb
ffmpeg: fix changing sample rate handling
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 04:06:59 +01:00
Michael Niedermayer
ec20fc1581
lavf: allow grouping packets in chunks of a user specified size and duration.
...
This is similar to MP4Boxs -inter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 03:53:13 +01:00
Michael Niedermayer
31f9032b78
lavf: add audio_preload option, this allows interleaving audio earlier
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 03:53:07 +01:00
Michael Niedermayer
54e40b9c14
ffmpeg: factorize duration calculation in transcode_video()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 03:49:38 +01:00
Michael Niedermayer
6e96ad8215
ffmpeg: make copy_tb tri state so the user can select either timebase or
...
leave it at auto
Inspired-by a change from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 03:49:37 +01:00
Michael Niedermayer
9d76cf0b18
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtpdec: Templatize the code for different g726 bitrate variants
rv40: move loop filter to rv34dsp context
lavf: make av_set_pts_info private.
rtpdec: Add support for G726 audio
rtpdec: Add an init function that can do custom codec context initialization
avconv: make copy_tb on by default.
matroskadec: don't set codec timebase.
rmdec: don't set codec timebase.
avconv: compute next_pts from input packet duration when possible.
lavf: estimate frame duration from r_frame_rate.
avconv: update InputStream.pts in the streamcopy case.
Conflicts:
avconv.c
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/oss_audio.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavformat/au.c
libavformat/eacdata.c
libavformat/flvdec.c
libavformat/mpegts.c
libavformat/mxfenc.c
libavformat/rtpdec_g726.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 02:54:24 +01:00
Michael Bradshaw
0275b75a7e
BPP fix, YUVP9, 10, 16 support, make RGB24 default
2011-11-30 16:48:03 -07:00
Carl Eugen Hoyos
9dcd8b86f9
Use correct context for av_log.
...
Fixes ticket #695 .
2011-12-01 00:28:46 +01:00
Michael Niedermayer
c863d3751f
movenc: replace cluster memset by zeroing only the needed field.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 23:11:49 +01:00
Martin Storsjö
c8f0e88b20
rtpdec: Templatize the code for different g726 bitrate variants
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-30 23:20:07 +02:00
Janne Grunau
bb8a6e03cc
rv40: move loop filter to rv34dsp context
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-30 20:54:59 +00:00
Michael Niedermayer
77af2672b4
lavc: Fix side data handling for audio decoders.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 21:19:23 +01:00
Michael Niedermayer
11828b8885
nellymoserdec: Use sidedata to support mid stream sample rate changes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 21:17:57 +01:00
Michael Niedermayer
957a593cd9
flvdemux: export flags for nellymoser through side data.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 21:16:33 +01:00
Anton Khirnov
c3f9ebf743
lavf: make av_set_pts_info private.
...
It's supposed to be called only from (de)muxers.
2011-11-30 20:34:45 +01:00
Michael Niedermayer
8f025f2f60
avfilter: align allocated images to 32 for AVX and IFF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 18:53:47 +01:00
Michael Niedermayer
fd3e75d2d4
lavc: horizontal align for IFF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 18:45:33 +01:00
Michael Niedermayer
8d5078c10b
ac3probe: Change threshold from 500 to 200 to keep in sync with mp3.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 18:08:23 +01:00
Michael Niedermayer
b51eaf3b8c
mp3probe: Detect mp3 stronger with just 200 frames, this should speed up detection
...
on mp3 streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 18:07:20 +01:00
Miroslav Slugeň
06d7325ab1
rtpdec: Add support for G726 audio
...
This requires using a separate init function, since there
isn't necessarily any fmtp lines for this codec, so
parse_sdp_a_line won't be called. Incorporating it with the
alloc function wouldn't do either, since it is called before
the full rtpmap line is parsed (where the sample rate is
extracted).
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-30 17:39:32 +02:00
Martin Storsjö
2583660664
rtpdec: Add an init function that can do custom codec context initialization
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-30 17:32:18 +02:00
Michael Niedermayer
dd32a305bd
wmall: fix return type of dump_int_buffer()
...
Found-by: Dominique Leuenberger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 15:23:39 +01:00