Michael Niedermayer
ed72dae4cf
ffmpeg: dont print "Conversion failed" if conversion has never started
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
gcocherel
2eddf3a6ef
avcodec/hevc: fix no output of prior pics and pic output flags(cherry picked from commit e99b96dff1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
978c193d47
cmdutils: omit deprecated codec ids in help output
These ids should be meaningless for the end user and would only
confuse
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
375a0c03a9
avformat/xwma: fix memleak of dpds_table
Fixes CID1087092
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cf4dbe9aff
avformat/xwma: improve error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c31ad87bc6
avformat/xwma: use NULL instead of 0 for pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
03b88f6b39
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
lavf/concatdec: implement automatic conversions.
lavf/concatdec: reindent after last commit.
lavf/concatdec: always do stream matching.
lavf/concatdec: check match_streams() return value.
lavf/concatdec: use a structure for each stream.
ffprobe: use the codec descriptor if no decoder was found.
lavf/matroska: add "binary" pseudo-MIME type.
lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
lavc: add a mime_types field to codec descriptors.
lavc: add AV_CODEC_ID_BIN_DATA.
lavc: add codec descriptors for TTF and OTF.
lavc: add codec descriptors for deprecated ids.
lavc/codec_desc: add separation comment.
tools/ffhash: implement base64 output.
tools/ffhash: use av_hash_final_hex().
lavu/hash: add hash_final helpers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4506ed336f
avformat/img2_alias_pix: fix 2 unused variable warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f694ca7ca7
avcodec/tiff: support 4:2:2 and 4:1:1 YCbCr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
217f6c53e5
Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'
* commit '5a70a783f04919514efec7751d710b64d8975fd7':
hls: Add an option to prepend a baseurl to the playlist entries
Conflicts:
doc/muxers.texi
libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fd601ba6b1
Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'
* commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f':
segment: Add an option to prepend a string to the list entries
Conflicts:
doc/muxers.texi
libavformat/segment.c
See: 5e278c19c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6a0b5e3476
avcodec/mpegvideo: fix null pointer dereference
Fixes: 111342.ogm with ffplay
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Nicolas George
41334fcab4
lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
11 years ago
Nicolas George
50ed6e3ce6
lavf/concatdec: implement automatic conversions.
11 years ago
Nicolas George
9d24a536a3
lavf/concatdec: reindent after last commit.
11 years ago
Nicolas George
b24d6c5303
lavf/concatdec: always do stream matching.
11 years ago
Nicolas George
c27939d871
lavf/concatdec: check match_streams() return value.
11 years ago
Nicolas George
e973cf04f6
lavf/concatdec: use a structure for each stream.
11 years ago
Nicolas George
43ca94a633
ffprobe: use the codec descriptor if no decoder was found.
11 years ago
Nicolas George
c9212abf95
lavf/matroska: add "binary" pseudo-MIME type.
Avoid long scan and "Could not find codec parameters for stream"
error when an attachment has this type.
11 years ago
Nicolas George
70beebe357
lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
The minor bump also covers AV_CODEC_ID_BIN_DATA.
11 years ago
Nicolas George
1bf6396498
lavc: add a mime_types field to codec descriptors.
11 years ago
Nicolas George
6ea1196673
lavc: add AV_CODEC_ID_BIN_DATA.
11 years ago
Nicolas George
892e2c2ad8
lavc: add codec descriptors for TTF and OTF.
11 years ago
Nicolas George
fa7bc7ed8b
lavc: add codec descriptors for deprecated ids.
11 years ago
Nicolas George
e419e29e1c
lavc/codec_desc: add separation comment.
11 years ago
Nicolas George
73c4b6ce4b
tools/ffhash: implement base64 output.
Also fix usage string: the algorithm is not optional.
11 years ago
Nicolas George
3926a30b58
tools/ffhash: use av_hash_final_hex().
11 years ago
Nicolas George
b804eb4323
lavu/hash: add hash_final helpers.
The helpers use local memory to compute the final hash,
making AV_HASH_MAX_SIZE safe to use.
11 years ago
Luca Barbato
5a70a783f0
hls: Add an option to prepend a baseurl to the playlist entries
Useful to generate playlists with absolute paths.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Enrique Arizón Benito
5c08ae4f37
segment: Add an option to prepend a string to the list entries
Useful to generate lists with absolute urls.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Reynaldo H. Verdejo Pinochet
5b881499a8
ffserver: do not ignore lseek() return
Should fix FFmpeg Coverity Scan issue #732177
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
11 years ago
Reynaldo H. Verdejo Pinochet
898192e029
ffserver: do not ignore getsockname() return
Should fix FFmpeg Coverity Scan issue #732176
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
11 years ago
Reynaldo H. Verdejo Pinochet
e79bc6a88a
ffserver: do not ignore send() return
Should fix Coverity Scan issue #732178
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
11 years ago
Reynaldo H. Verdejo Pinochet
8baa5b32a5
ffserver: do not ignore setsockopt return
Should fix FFmpeg Coverity Scan issue #732181
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
11 years ago
Reynaldo H. Verdejo Pinochet
6d953ae2c4
ffserver: do not ignore ff_socket_nonblock return
Should fix FFmpeg Coverity Scan issues #732180 & #732182
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
11 years ago
Michael Niedermayer
ede411dd03
avcodec/vc1_parser: fix use of uinitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7c71076470
avutil/log: fix memleak from 669a09fb37
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
648f7a6ec5
ffmpeg_dxva2: fix mixing of declarations and statements
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
21c7e99659
Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'
* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a':
configure: rework dxva in avconv handling
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c6eee3120a
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
avconv: add support for DXVA2 decoding
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9c6eef6f5f
Merge commit 'b2b4afe8115fe3c8b005d663610e5af06f110165'
* commit 'b2b4afe8115fe3c8b005d663610e5af06f110165':
hwaccel: fix dxva2 & vaapi loop filter parameters
See: 0ad8f73f13
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0f630b7b12
Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'
* commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05':
dxva2_h264: add a workaround for old Intel GPUs
Conflicts:
doc/APIchanges
libavcodec/version.h
See: 8b2a130d3f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2548f8a237
Merge commit '2fcef90bee98bffeff1d95b7197738f50c450d86'
* commit '2fcef90bee98bffeff1d95b7197738f50c450d86':
dxva2_h264: set the correct ref frame index in the long slice struct
Conflicts:
libavcodec/dxva2_h264.c
See: 276839b8de
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fed0acebad
ffmpeg: print an error at the end if conversion failed
Fixes Ticket3477
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
68c3e6025f
Fix convertion typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
a61c2115fb
configure: rework dxva in avconv handling
Move the dxva check after the dependencies have been detected, make sure
the ole32 library exists.
Fixes build on non-Windows.
11 years ago
Hendrik Leppkes
35177ba77f
avconv: add support for DXVA2 decoding
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Michael Niedermayer
8120668351
avcodec/hevc_cabac: decrease CABAC_MAX_BIN
Prevents shifts with undefined behavior
Fixes CID1206634
Fixes CID1206635
Fixed CID1206636
Reviewed-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b2b4afe811
hwaccel: fix dxva2 & vaapi loop filter parameters
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago