Michael Niedermayer
3c096751ff
avformat/utils: compute_pkt_fields: Fix DTS for the case where has_b_frames is too large but the correct one is constant
...
Fixes issue1.m2ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 14:31:23 +01:00
Michael Niedermayer
d4dfa97ae3
avformat/utils: reset pts_buffer in estimate_timings_from_pts()
...
This fixes the first few dts after find_stream_info
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 14:31:23 +01:00
Michael Niedermayer
f288e1b67c
avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 14:31:23 +01:00
Paul B Mahol
8bcacd9f42
SDR2 demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-02-22 11:40:27 +00:00
Luca Barbato
d922c5a5fb
h264: Fix a typo from the previous commit
...
f777504f64
changed a - in +
CC: libav-stable@libav.org
2014-02-22 12:26:32 +01:00
Carl Eugen Hoyos
b89596a432
Fix FSF address in colormatrix and libzvbi license headers.
...
As reported by irc user aca.
The files in compat/avisynth are maintained elsewhere, no changes.
2014-02-22 11:17:56 +01:00
Michael Niedermayer
44b22bba42
avcodec/h264_ps: fix printed num_reorder_frames value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 02:55:55 +01:00
Michael Niedermayer
8c55ff3933
avcodec/h264: use subsample factors of the used pixel format
...
Fixes out of array read
Fixes: 1cb91c36c4e55463f14aacb9bdf55b38-asan_heap-oob_106cbce_5617_cov_11212800_h264_mmx_chroma_intra_lf.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 23:53:49 +01:00
Michael Niedermayer
9aa59a9ce6
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mxf: Add DNxHD UL
See: 2ff540a0fe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 21:15:08 +01:00
Michael Niedermayer
f93bd82ee6
Merge commit 'a9099e04026f300924ac363fa6f8aef912677d90'
...
* commit 'a9099e04026f300924ac363fa6f8aef912677d90':
mxf: Add uncompressed 422 8-bit rawvideo UL
Conflicts:
libavformat/mxf.c
See: 51d632cc8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 21:08:53 +01:00
Reynaldo H. Verdejo Pinochet
b295bce148
qcelp: grammar
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
2014-02-21 16:57:26 -03:00
Reynaldo H. Verdejo Pinochet
84cdd2fd80
qcelpdec: break some too-long lines
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
2014-02-21 16:57:26 -03:00
Michael Niedermayer
c8f3c3a579
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Do not warn about missing start time for unknown streams.
Only complain about missing frame rate for video streams.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 18:45:16 +01:00
Michael Niedermayer
a0f8e6ad67
tests/tiny_ssim: drop isatty() support
...
tiny_ssim is build on the host, not the target and the HAVE_* are set for the
target.
This patch fixes building tiny_ssim when HAVE_* differed between target and host
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 17:29:58 +01:00
Carl Eugen Hoyos
f5fe6a4f79
Do not warn about missing start time for unknown streams.
2014-02-21 17:27:37 +01:00
Carl Eugen Hoyos
1f7e9be0b0
Only complain about missing frame rate for video streams.
2014-02-21 17:27:20 +01:00
Tomas Härdin
c416b5cdf1
mxf: Add DNxHD UL
...
Note that the old DNxHD UL is actually JPEG 2000 according to RP224.
Leaving it as-is for now.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-02-21 15:46:10 +01:00
Philip de Nier
a9099e0402
mxf: Add uncompressed 422 8-bit rawvideo UL
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-02-21 15:46:05 +01:00
Michael Niedermayer
6e63867771
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libvorbis: Give consistent names to all functions, structs, and defines
Conflicts:
libavcodec/libvorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 13:56:53 +01:00
Diego Biurrun
dc9e05e279
libvorbis: Give consistent names to all functions, structs, and defines
2014-02-21 11:08:09 +01:00
Michael Niedermayer
20fa3fb93d
avformat/movenc: assert that get_cluster_duration() value is valid
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 04:41:21 +01:00
Michael Niedermayer
1b872de8f4
avformat/movenc: check that the input timestamps are within the range that can be stored in mov
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 04:41:21 +01:00
Michael Niedermayer
76dd01ecd4
avcodec/h264: fix sign error
...
regression since f777504f64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 00:33:57 +01:00
Michael Niedermayer
0ad8f73f13
avcodec: fix dxva2 & vaapi after removing the +52 offset from the loop filter parameters
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 00:21:22 +01:00
Michael Niedermayer
de7b50e9cd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h264: Lower bound check for slice offsets
Conflicts:
libavcodec/h264.c
See: 91253839e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 00:20:55 +01:00
Michael Niedermayer
f2387152bc
Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'
...
* commit '5c79d2e12d13959fc6aed92d102c25194a06de05':
avconv: Do not divide by zero
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 23:59:09 +01:00
Michael Niedermayer
9026c49c82
Merge commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e'
...
* commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e':
configure: Add usan to the toolchain presets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 23:39:49 +01:00
Michael Niedermayer
5176e9651b
Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'
...
* commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0':
configure: Move cpunop into ARCH_EXT_LIST_X86
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 23:27:13 +01:00
Michael Niedermayer
36eec03211
Merge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'
...
* commit '6adf4290ebcf65ac8243d74f34ba0a508f561633':
configure: Move inet_aton check into network function check block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 23:18:11 +01:00
Michael Niedermayer
490215cbd7
Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'
...
* commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4':
aarch64: use EXTERN_ASM consistently for exported symbols
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 23:13:13 +01:00
Michael Niedermayer
1859b1de31
Merge commit '996697e266c8adc0ad9b7fc7568406c7529c97cf'
...
* commit '996697e266c8adc0ad9b7fc7568406c7529c97cf':
x86: float dsp: unroll SSE versions
See: 133b34207c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 23:11:38 +01:00
Michael Niedermayer
1bef9c5e83
Merge commit 'ef010f08ae53479c54e2f16be5a7e1a809a9e268'
...
* commit 'ef010f08ae53479c54e2f16be5a7e1a809a9e268':
dca: replace some memcpy by AV_COPY128
See: 5a48caa34b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 23:07:34 +01:00
Michael Niedermayer
4d943cec68
Merge commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31'
...
* commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31':
h264: avoid undefined behavior in chroma motion compensation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 23:02:38 +01:00
Vittorio Giovara
f777504f64
h264: Lower bound check for slice offsets
...
And use the value from the specification.
Sample-Id: 00000451-google
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-02-20 18:58:38 +01:00
Luca Barbato
5c79d2e12d
avconv: Do not divide by zero
2014-02-20 18:58:38 +01:00
Luca Barbato
d6a27f885b
configure: Add usan to the toolchain presets
...
clang-3.4 and gcc-4.9 have it.
2014-02-20 18:58:38 +01:00
Diego Biurrun
2b0bb69997
configure: Move cpunop into ARCH_EXT_LIST_X86
...
It is a processor feature, so it belongs there.
2014-02-20 18:20:08 +01:00
Diego Biurrun
6adf4290eb
configure: Move inet_aton check into network function check block
2014-02-20 18:20:07 +01:00
Michael Niedermayer
0c803eba2f
avformat/mov: make invalid sampledelta error more verbose
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 18:04:44 +01:00
Michael Niedermayer
d089e9a4d1
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
ffmpeg: make reading packets from thread blocking.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 16:29:15 +01:00
Michael Niedermayer
c427b2b86e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpeg4video_parser: Drop pointless av_-prefix from static function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 15:43:03 +01:00
Michael Niedermayer
add54280bf
Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'
...
* commit '984e3398662d460e15904f9e4a6df9ef759070cb':
avcodec: Consistently name encoder init functions foo_encode_init
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 15:27:03 +01:00
Janne Grunau
9c029f67ca
aarch64: use EXTERN_ASM consistently for exported symbols
...
Based on e3fec3f095
for arm.
2014-02-20 15:24:35 +01:00
Michael Niedermayer
8372aaf721
Merge commit '017a06a9ee86b047079166c2694c9c655ff03356'
...
* commit '017a06a9ee86b047079166c2694c9c655ff03356':
x86: dsputil: Use correct file name as multiple inclusion guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 14:58:04 +01:00
Michael Niedermayer
a0cfec2e2b
Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'
...
* commit 'ba42c852477e87f6e47a5587e8f7829c46c52032':
bit_depth_template: Use file name as multiple inclusion guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 14:57:31 +01:00
Michael Niedermayer
e948f17369
Merge commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef'
...
* commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef':
svq3: Adjust #endif comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 14:44:57 +01:00
Michael Niedermayer
fdba564585
Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'
...
* commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f':
build: The MPEG-4 video parser depends on h263dsp
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 14:39:33 +01:00
Christophe Gisquet
996697e266
x86: float dsp: unroll SSE versions
...
vector_fmul and vector_fmac_scalar are guaranteed that they can process in
batch of 16 elements, but their SSE versions only does 8 at a time.
Therefore, unroll them a bit.
299 to 261c for 256 elements in vector_fmac_scalar on Arrandale/Win64.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-02-20 14:18:05 +01:00
Christophe Gisquet
ef010f08ae
dca: replace some memcpy by AV_COPY128
...
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-02-20 14:16:43 +01:00
Janne Grunau
982b596ea6
h264: avoid undefined behavior in chroma motion compensation
...
Makes fate-h264 pass under valgrind --undef-value-errors=yes with
-cpuflags none. {avg,put}_h264_chroma_mc8_8 approximately 5% faster,
{avg,put}_h264_chroma_mc4_8 2% faster both on x86 and arm.
2014-02-20 14:02:06 +01:00