Michael Niedermayer
04047b6166
avformat/http: print http headers at AV_LOG_DEBUG level
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 01:38:08 +01:00
Stefano Sabatini
246e323de8
lsws/utils: fix typo
2013-11-05 00:04:17 +01:00
Stefano Sabatini
988e2e7c1c
lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings
2013-11-05 00:04:17 +01:00
Michael Niedermayer
bd75651378
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
omadec: loosen format probing constraints
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 22:46:22 +01:00
Michael Niedermayer
aeaca3816c
Merge commit ' 1c736bedd9'
...
* commit '1c736bedd9 ':
omadec: check GEOB sizes against buffer size
Conflicts:
libavformat/omadec.c
See: e74fa25cb9
See: 91e72e3514
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 22:08:59 +01:00
Michael Niedermayer
b1f213a83a
Merge commit ' 97f50e92b5'
...
* commit '97f50e92b5 ':
omadec: Fix wrong number of array elements
See: 4f5d1468f5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:59:55 +01:00
Michael Niedermayer
4b4a7fcb07
Merge commit ' e73996954d'
...
* commit 'e73996954d ':
filtfmts-test: Fix use of deprecated API
Conflicts:
libavfilter/filtfmts.c
See: f12174c8ce
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:52:46 +01:00
Michael Niedermayer
2865c1b905
Merge commit ' 3ef9b7ab95'
...
* commit '3ef9b7ab95 ':
hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:43:27 +01:00
Michael Niedermayer
b906d04881
Merge commit ' 885ec92425'
...
* commit '885ec92425 ':
hevc: Use parsed VUI colorimetry in avcodec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:37:34 +01:00
Michael Niedermayer
be41f21a3d
Merge commit ' cd8f772d06'
...
* commit 'cd8f772d06 ':
lavc: Add colorimetry values for BT.2020, other non-included ones
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:26:34 +01:00
Michael Niedermayer
b84cd22a66
Merge commit ' 446e37dc97'
...
* commit '446e37dc97 ':
vf_fieldorder: remove superfluous get_video_buffer
Conflicts:
libavfilter/vf_fieldorder.c
See: 9b35bee696
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 21:19:25 +01:00
David Goldwich
0a7fef39fc
omadec: loosen format probing constraints
...
Imporoves detection of some files in the wild:
- ID3v2 a.k.a. "ea3" header is optional.
- Version and flags in ID3v2 header are unspecified.
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 18:43:18 +01:00
Michael Niedermayer
1c736bedd9
omadec: check GEOB sizes against buffer size
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 18:43:03 +01:00
Michael Niedermayer
97f50e92b5
omadec: Fix wrong number of array elements
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 18:38:01 +01:00
Diego Biurrun
e73996954d
filtfmts-test: Fix use of deprecated API
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2013-11-04 16:20:44 +01:00
Yusuke Nakamura
3ef9b7ab95
hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2013-11-04 16:19:53 +01:00
Jan Ekström
885ec92425
hevc: Use parsed VUI colorimetry in avcodec
...
Also limit the parsed VUI values to known valid ones.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2013-11-04 16:03:11 +01:00
Jan Ekström
cd8f772d06
lavc: Add colorimetry values for BT.2020, other non-included ones
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2013-11-04 15:39:33 +01:00
Michael Niedermayer
85cabf1ca9
avutil: add av_fopen_utf8()
...
fopen() on windows uses UTF-16, we use UTF-8 everywhere, this
function bridges the gap by using avpriv_open()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 15:38:52 +01:00
Michael Niedermayer
d0ac60730d
avfilter/vf_scale: add ov/hsub
...
Suggested-by: divVerent
Reviewed-by: Stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 15:23:26 +01:00
Vittorio Giovara
446e37dc97
vf_fieldorder: remove superfluous get_video_buffer
2013-11-04 14:37:06 +01:00
Clément Bœsch
fb10b43fc4
doc/examples: rename demuxing to demuxing_decoding.
...
That example shows how the decoding process works, not only the
demuxing.
2013-11-04 12:53:06 +01:00
Clément Bœsch
d10b1a200d
doc/examples/demuxing: show how to use the reference counting system.
2013-11-04 12:53:06 +01:00
Michael Niedermayer
405ceb1812
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aacdec: Set the profile during decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 11:51:13 +01:00
Michael Niedermayer
ab71be0912
Merge commit ' da6506c607'
...
* commit 'da6506c607 ':
lavc: move AVCodecContext.pkt to AVCodecInternal
Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 11:41:55 +01:00
Michael Niedermayer
3fc26d8073
Merge commit ' 38ecc3702d'
...
* commit '38ecc3702d ':
pthread: store thread contexts in AVCodecInternal instead of AVCodecContext
Conflicts:
libavcodec/internal.h
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 11:14:38 +01:00
Michael Niedermayer
2a7cbc29a8
Merge commit ' daa7a1d443'
...
* commit 'daa7a1d443 ':
pthread_slice: rename ThreadContext -> SliceThreadContext
Conflicts:
libavcodec/pthread_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 11:05:52 +01:00
Michael Niedermayer
4eea41cba1
Merge commit ' cc14ee03a7'
...
* commit 'cc14ee03a7 ':
lavc: split slice and frame threading functions into separate files
Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 10:44:34 +01:00
Michael Niedermayer
3d4dc43259
Merge commit ' 5cd6513f5b'
...
* commit '5cd6513f5b ':
pthread: drop avcodec_ prefixes from static functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 09:55:24 +01:00
Michael Niedermayer
f3758e8b80
Merge commit ' 694d997afe'
...
* commit '694d997afe ':
x86: hpeldsp: Use PAVGB instruction macro where necessary
See: 074155360d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 09:49:12 +01:00
Gian-Carlo Pascutto
454959a5aa
aacdec: Set the profile during decoding
...
Previously the profile would not be set if the bitstream needs
to be decoded to know the profile.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 08:51:26 +01:00
Anton Khirnov
da6506c607
lavc: move AVCodecContext.pkt to AVCodecInternal
...
It's a private field, not meant to be accessed from outside lavc.
2013-11-04 08:51:26 +01:00
Anton Khirnov
38ecc3702d
pthread: store thread contexts in AVCodecInternal instead of AVCodecContext
...
It's a private field, it should not be visible to callers.
Deprecate AVCodecContext.thread_opaque
2013-11-04 08:51:26 +01:00
Anton Khirnov
daa7a1d443
pthread_slice: rename ThreadContext -> SliceThreadContext
...
This should prevent confusion with frame threading.
2013-11-04 08:51:26 +01:00
Anton Khirnov
cc14ee03a7
lavc: split slice and frame threading functions into separate files
2013-11-04 08:51:26 +01:00
Anton Khirnov
5cd6513f5b
pthread: drop avcodec_ prefixes from static functions
2013-11-04 08:51:26 +01:00
Ronald S. Bultje
6cf0c4107f
Put vp9_scans and vp9_scans_nb in ro_data.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 02:32:18 +01:00
Michael Niedermayer
e135166206
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavd/pulse: add ff_ prefix and fix param type
lavd/pulse_audio_enc: fix flush return code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 02:08:48 +01:00
Mikulas Patocka
694d997afe
x86: hpeldsp: Use PAVGB instruction macro where necessary
...
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-04 01:29:23 +01:00
Michael Niedermayer
1a4ffa5b13
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
build: Remove redundant OBJS declaration intended for programs
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 01:20:46 +01:00
Lukasz Marek
babf20a215
lavd/pulse: add ff_ prefix and fix param type
...
Add ff_ prefix for internal API function.
Change type of param from int into enum AVCodecID as it is more specific.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-11-04 00:47:00 +01:00
Lukasz Marek
398844f093
lavd/pulse_audio_enc: fix flush return code
...
Successful flushing is reported by returning 1 instead of 0.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-11-04 00:23:39 +01:00
wm4
3220a894f7
http: add hack to make streams served by MediaGateway not seekable
...
These streams are reported as seekable, but all tests show they are not,
and the server merely pretends the streams are seekable. The server
responds with:
content-range: bytes 0-1999999999/2000000000
Range requests seem to be correctly answered, but the actual data
returned at the same offset is different. Assume this is a bug in the
server software. The server identifies itself as:
Server: MediaGateway 3.5.2-001
Add a hack that checks the server name, and disables seeking in this
case.
Test URL: http://8283.live.streamtheworld.com:80/CBC_R1_VCR_H_SC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 22:57:56 +01:00
Michael Niedermayer
336a1902d6
avcodec/ffv1enc: Check high bpp RGB against coder type too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 22:18:47 +01:00
Michael Niedermayer
8b73a3f6f6
avformat/utils: never decrease has_b_frames in compute_pkt_fields()
...
The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values
Found-by: divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 21:36:10 +01:00
Mikulas Patocka
074155360d
avcodec/x86/hpeldsp: fix crash on AMD K6-3+
...
There are instructions pavgb and pavgusb. Both instructions do the same
operation but they have different enconding. Pavgb exists in SSE (or
MMXEXT) instruction set and pavgusb exists in 3D-NOW instruction set.
livavcodec uses the macro PAVGB to select the proper instruction. However,
the function avg_pixels8_xy2 doesn't use this macro, it uses pavgb
directly.
As a consequence, the function avg_pixels8_xy2 crashes on AMD K6-2 and
K6-3 processors, because they have pavgusb, but not pavgb.
This bug seems to be introduced by commit
71155d7b41 , "dsputil: x86: Convert mpeg4
qpel and dsputil avg to yasm"
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 19:49:11 +01:00
Diego Biurrun
8b63ebcb03
build: Remove redundant OBJS declaration intended for programs
2013-11-03 18:52:11 +01:00
Stefano Sabatini
535d58959d
ffmpeg: add verbose consistency checks in case of filtering inconsistent options
...
In particular, warn in case -filter and streamcopy is used at the same
time, fix trac ticket #678 .
2013-11-03 18:05:43 +01:00
Stefano Sabatini
cfe7185a92
lavc: remove dead FF_API_OLD_TIMECODE API
2013-11-03 17:58:44 +01:00
Stefano Sabatini
a689560428
lavc: remove dead FF_API_AVCODEC_OPEN API
2013-11-03 17:58:44 +01:00