Michael Niedermayer
cd960c8a4f
Merge commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821'
...
* commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821':
png: improve signature check
Conflicts:
libavcodec/pngdec.c
See: 8a08503b78f59d61cf98b9deb99363e3e07d8599
See: 0a3589bf2f0a23b0eb68664fbb00078abe882a88
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 02:54:04 +01:00
Michael Niedermayer
140dfd14fd
Merge commit '456ffec35d55288d589aa1901919e038c3427f30'
...
* commit '456ffec35d55288d589aa1901919e038c3427f30':
img2dec: correctly use the parsed value from -start_number
No change, start_number works fine without this change
and does not work with it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 02:35:28 +01:00
Michael Niedermayer
3cfd07a53f
fate: add qp filter test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 20:45:50 +01:00
Paul B Mahol
baea14d860
avfilter: port qp filter from libmpcodecs
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 18:46:38 +01:00
Vittorio Giovara
1e76345432
png: improve signature check
...
Return proper error code, print an error message and add missing
parentheses.
2015-01-14 17:10:19 +01:00
Vittorio Giovara
456ffec35d
img2dec: correctly use the parsed value from -start_number
...
Previously the image sequence was always starting from the minimum
number rather than the requested one.
CC: libav-stable@libav.org
2015-01-14 17:10:01 +01:00
Michael Niedermayer
c4f1abecb1
avcodec/sunrast: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 13:35:11 +01:00
Michael Niedermayer
e6f1601d6d
avcodec/svq3: Use av_mallocz_array() for emu_edge_buffer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 13:23:57 +01:00
Michael Niedermayer
2493558a06
avcodec/svq3: Check av_mallocs return value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 13:23:20 +01:00
Hendrik Leppkes
a9d700f212
mpegts: identify h264 mvc streams
...
This fixes missdetecting such streams as something else like AAC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 01:39:16 +01:00
Michael Niedermayer
f2e12f8942
avformat/smoothstreamingenc: Add missing "goto fail"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 00:17:52 +01:00
Michael Niedermayer
8d7d88135c
avformat/mpeg: Avoid dead assignment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 00:06:43 +01:00
Michael Niedermayer
e172f5e53a
avcodec/hevc: Fix handling of skipped_bytes() reallocation failures
...
Fixes CID1260704
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-13 20:10:21 +01:00
wm4
921706691a
qpeg: avoid pointless invalid memcpy()
...
If refdata was NULL, the memcpy() ended up copying the same memory
block onto itself, which is not only pointless, but also undefined
behavior.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-13 17:27:45 +01:00
Michael Niedermayer
295b79b5d8
avcodec/roqvideoenc: Check for av_malloc_array() failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-13 15:14:27 +01:00
Michael Niedermayer
88a46fa8c9
avcodec/snowenc-test: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-13 15:04:15 +01:00
Michael Niedermayer
482761b85a
avcodec/snowenc-test: check for av_malloc*() failures
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-13 15:02:36 +01:00
Stefano Sabatini
c648879827
Changelog: mention the port of various mp PP filters
2015-01-13 13:13:04 +01:00
Arwa Arif
8c7e512ad9
lavfi: remove mp=pp7
...
The filter was ported to a native libavfilter filter in
a299cd5ab3567bdf855dc84cdbed4d22ea5fcbb6.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2015-01-13 13:13:04 +01:00
Stefano Sabatini
57ede2a507
lavfi: use ff_norm_qscale(), factorize
2015-01-13 13:12:58 +01:00
Mark Reid
b23a866844
libavformat/mxfdec.c: export the full UMID as metadata
...
Previous version reviewed-by: tim nicholson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-13 01:16:39 +01:00
Michael Niedermayer
fbe8672e15
avcodec/shorten: use av_reallocp_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 23:46:50 +01:00
Michael Niedermayer
56c7e1059a
avcodec/snow: Fix av_malloc* failure checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 23:46:50 +01:00
Michael Niedermayer
13871a95d0
avcodec/snow: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 23:36:00 +01:00
Michael Niedermayer
24222cc1d5
avcodec/opus_imdct: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 23:36:00 +01:00
Mark Reid
b08b5f4be2
libavformat/mxfdec.c: read project_name metadata
...
MXF files generated by Media Composer or LibMXF can contain a
project name property in the Preface. Lots of existing samples have them.
http://samples.ffmpeg.org/MXF/issue2160/PW0805A0V01.4C5B5636.EFA330.mxf
project_name : DNX145 PW Test
http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket3450/WriteAvidMXFgenerated/5502_0010_v1.mxf
project_name : Rombus
http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket3100/1sec_mxf_test_Video5270C795.mxf
project_name : NVB_DOOD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 20:26:58 +01:00
James Almer
59ac93f6af
x86/swr: add SSE/AVX unpack_6ch functions
...
int32/float only
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-01-12 15:40:03 -03:00
Lou Logan
e9f8780381
doc/general: update libilbc link
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2015-01-12 09:32:06 -09:00
James Almer
3aaff80348
avutil/opencl: don't include config.h
...
It's not an installed header.
Tested-by: Thilo Borgmann <thilo.borgmann@mail.de>
Tested-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-01-12 13:49:56 -03:00
Michael Niedermayer
365ef88d5d
avcodec/wma: Print more details in case of spectral RLE overflows
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 13:56:13 +01:00
Michael Niedermayer
4f664d8aae
avcodec/ccaption_dec: Fix typos and cosmetics
...
Found-by: ubitux
(rest of found stuff left to the author to decide which way to fix)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 13:43:53 +01:00
Michael Niedermayer
e2db9a736f
avcodec/wmadec: fix 0 frame bit_reservoir
...
Fixes Ticket968
partly fixes Ticket691
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 03:33:16 +01:00
Michael Niedermayer
a8bc901033
avcodec/wmadec: also print the number of bits left in the nb_frames <= 0 case
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 03:33:02 +01:00
Michael Niedermayer
843d93d286
doc/codecs: document nomc flag
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-12 01:18:01 +01:00
Anshul Maheshwari
78e78f621b
Adding Closed caption accessories
...
Signed-off-by: Anshul Maheshwari <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 22:19:48 +01:00
Anshul Maheshwari
4b6262610b
Adding Closed caption Support
...
Signed-off-by: Anshul Maheshwari <anshul.ffmpeg@gmail.com>
To test Closed caption use following command
ffmpeg -f lavfi -i "movie=input.ts[out0+subcc]" -map s output.srt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 22:19:48 +01:00
Lukasz Marek
f463df18bc
cmdutils: use av_match_name to filter devices
...
Device name may be coma-separated list.
Use dedicated funtion to compare.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-01-11 18:58:33 +01:00
Lukasz Marek
ea0ac11f1b
lavd/v4l2: implement list device callback
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-01-11 18:58:33 +01:00
Lukasz Marek
44e6eeb30d
cmdutils: use helper functions for listing sinks/sources
...
List device callback must be able to return valid list without opening device.
This callback should return input values for open function, not vice-versa.
Read header funtion is very likey to fail without proper configuration provided.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-01-11 18:58:33 +01:00
Lukasz Marek
007c33df0a
lavd/avdevice: introduce helper functions for sink/sources listing
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-01-11 18:58:26 +01:00
Lukasz Marek
9241e544ff
lavd/avdevice: remove av_ prefix from private function
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-01-11 18:54:49 +01:00
Michael Niedermayer
8b13a4d6f0
avcodec/error_resilience: Remove special case for H.264 from is_intra_more_likely
...
This should not be needed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 17:30:02 +01:00
Michael Niedermayer
855463c007
avcodec/h264: Keep a reference to the last picture for EC
...
This and the next commit improve error concealment for
green-block-artifacts-from-canon-100-hs.MOV
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 17:30:02 +01:00
Michael Niedermayer
cba199b595
avcodec/options_table: add entries for MPEG4 video profiles
...
Fixes part of Ticket2901
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 14:55:28 +01:00
Michael Niedermayer
bcfd9f8d7f
avcodec/proresdec_lgpl: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 13:42:06 +01:00
Michael Niedermayer
4207c5a4ce
avcodec/pgssubdec: Use av_malloc*_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 13:41:14 +01:00
Michael Niedermayer
0f08b587fa
avcodec/libvo-aacenc: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 13:32:55 +01:00
Carl Eugen Hoyos
a5334d4081
Handle r10k endianess atom DpxE.
...
Fixes playback and remuxing of r10k_full-range_big-endian.mov.
Reported, analyzed and tested by Olaf Matthes, olaf matthes gmx de
2015-01-11 12:15:03 +01:00
Michael Niedermayer
aa6545e1f3
avformat/hlsenc: more robust error tests
...
errors are negative throughout ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 05:17:44 +01:00
James Almer
6abf00d615
x86/swr: load constants outside the loop in pack_6ch functions
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-01-11 01:11:46 -03:00