Michael Niedermayer
d7ade20adb
avcodec: add AV_EF_IGNORE_ERR
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04 13:24:40 +02:00
Michael Niedermayer
0c06ca7a8a
Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'
...
* commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964':
aac: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 23:21:26 +02:00
Michael Niedermayer
3ea5beab8f
Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'
...
* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f':
flv: K&R formatting cosmetics
Conflicts:
libavcodec/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 23:15:37 +02:00
Michael Niedermayer
0a5cc20d4a
avcodec/jpeglsdec: add cast to silence pointer type warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 22:54:01 +02:00
Michael Niedermayer
a520d8fd35
avcodec/snow_dwt: fix "incompatible pointer type" warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 22:49:21 +02:00
Michael Niedermayer
5918c5a4cc
avcodec/kgv1dec: add casts to silence "assignment from incompatible pointer type"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 22:09:26 +02:00
Michael Niedermayer
bb605ef8ab
avcodec/xbmdec: fix pointer type warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 22:07:54 +02:00
Michael Niedermayer
56cc178485
avcodec/h263dec: fix "incompatible pointer type" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 20:23:12 +02:00
Michael Niedermayer
77df9de78c
avcdoec/snowenc: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 20:08:18 +02:00
Michael Niedermayer
cc86158173
avcodec/ffv1dec: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 20:08:18 +02:00
Matt Oliver
3c3e02b8d1
x86/cavdsp: prevent named constraints appearing twice.
2014-05-03 17:47:55 +02:00
Michael Niedermayer
7ef01a7878
avcodec/h264: mark recovery_cnt==0 frames as keyframes
...
Fixes Ticket3063
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 16:01:45 +02:00
Carl Eugen Hoyos
a75349d0c8
Fix standalone compilation of dsd planar decoders.
2014-05-03 08:53:57 +02:00
Carl Eugen Hoyos
4116cbeaf5
Fix oga muxer standalone compilation.
2014-05-03 08:51:27 +02:00
Michael Niedermayer
64e448994c
avcodec/h263dec: print MB position for each MB when TRACE is enabled
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-02 22:47:11 +02:00
Michael Niedermayer
41a679000f
avcodec/mpegvideo: fix gray*() parameter types
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-02 17:12:42 +02:00
Michael Niedermayer
c60b266eac
avcodec/mpegvideo: support disabling motion compensation
...
This allows analyzing videos without having prior and current frames mixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-02 16:51:39 +02:00
Michael Niedermayer
e881a96632
avcodec/libxvid: improve return codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 23:08:01 +02:00
Michael Niedermayer
2ff81d0916
avcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 22:59:59 +02:00
Michael Niedermayer
bbc604020f
avcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 22:01:38 +02:00
Michael Niedermayer
77811482ab
avcodec/utils: ff_decode_frame_props: set pkt_size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 22:01:38 +02:00
Michael Niedermayer
58f4d1266b
Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'
...
* commit 'ba71c74017c287681153ec8f6f1cba650d797275':
lavc: deprecate AVCodecContext.codec_name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 18:04:53 +02:00
Michael Niedermayer
e77b9853ea
Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
...
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
lavc: move CODEC_FLAG_MV0 to mpegvideo
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 17:03:59 +02:00
Michael Niedermayer
e40ae8cc00
Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'
...
* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400':
lavc: make the xvid-specific "gmc" flag a private option of libxvid
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 16:56:40 +02:00
Michael Niedermayer
1851643987
Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'
...
* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683':
lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 16:46:38 +02:00
Michael Niedermayer
cac07d0e10
Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'
...
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 16:41:41 +02:00
Luca Barbato
a90d92ce2a
aac: K&R formatting cosmetics
2014-05-01 13:00:57 +02:00
Luca Barbato
c6b42e8549
flv: K&R formatting cosmetics
2014-05-01 13:00:57 +02:00
Anton Khirnov
ba71c74017
lavc: deprecate AVCodecContext.codec_name
...
It is undocumented and has no real use.
2014-05-01 09:31:32 +02:00
Anton Khirnov
e7fc9796d8
lavc: do not use AVCodecContext.codec_name in avcodec_string()
...
That field will be deprecated.
2014-05-01 09:26:57 +02:00
Anton Khirnov
a2941c8cb2
lavc: move CODEC_FLAG_MV0 to mpegvideo
2014-05-01 09:24:18 +02:00
Anton Khirnov
6484149158
lavc: make the xvid-specific "gmc" flag a private option of libxvid
2014-05-01 09:24:02 +02:00
Anton Khirnov
b2c31710c9
lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo
2014-05-01 09:23:19 +02:00
Anton Khirnov
5fccedaa67
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED
...
The addition of reference-counted frames makes it pointless.
2014-05-01 09:22:47 +02:00
Michael Niedermayer
617e866e25
Move av_find_best_pix_fmt_of_2() from avcodec to avutil
...
This avoids a dependancy of libavfilter on libavcodec
See Ticket 3592
Fixes Ticket2784
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 23:14:05 +02:00
Michael Niedermayer
0eb9482e32
avcodec/flacenc: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 18:28:40 +02:00
Michael Niedermayer
f08ca91b05
avcodec/ivi_common: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 18:27:51 +02:00
Michael Niedermayer
8532566e80
avcodec/mjpegdec: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 18:26:28 +02:00
Michael Niedermayer
1e25afc181
avcodec/tiff: Support 410 and 440 YCbCr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 17:41:31 +02:00
Michael Niedermayer
f0c78b0769
avcodec/vorbisdec: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 05:23:44 +02:00
Michael Niedermayer
0a266cb55a
avcodec/vorbisdec: try to workaround libvorbisenc bug
...
Fixes Ticket3590
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 05:23:37 +02:00
Michael Niedermayer
37ce3188de
Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'
...
* commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521':
h264: drop commented out cruft
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 00:38:13 +02:00
Michael Niedermayer
b3d48c315d
Merge commit 'c1f92d13589d431e576d719dd44427486a5e05cd'
...
* commit 'c1f92d13589d431e576d719dd44427486a5e05cd':
mpegvideo: remove unused MpegEncContext.b4_stride
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 00:28:51 +02:00
Michael Niedermayer
8b30702c44
Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'
...
* commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1':
mpegvideo: move the MpegEncContext fields used from arm asm to the beginning
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 00:23:01 +02:00
gcocherel
2eddf3a6ef
avcodec/hevc: fix no output of prior pics and pic output flags(cherry picked from commit e99b96dff1d76d74cb5633aa9702828d863050e2)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 22:43:25 +02:00
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>
2014-04-29 19:29:48 +02:00
Michael Niedermayer
f694ca7ca7
avcodec/tiff: support 4:2:2 and 4:1:1 YCbCr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 18:39:24 +02:00
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>
2014-04-29 14:52:12 +02:00
Anton Khirnov
9d76dd952f
h264: drop commented out cruft
2014-04-29 14:49:42 +02:00
Anton Khirnov
c1f92d1358
mpegvideo: remove unused MpegEncContext.b4_stride
2014-04-29 14:49:42 +02:00