OSDN Git Service
Michael Niedermayer [Tue, 19 Nov 2013 17:18:47 +0000 (18:18 +0100)]
Merge commit '
6f1ec8edf2416441e2348f3a0915c9fee179d7da'
* commit '
6f1ec8edf2416441e2348f3a0915c9fee179d7da':
avcodec.h: include version.h before using version macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 17:08:58 +0000 (18:08 +0100)]
avfilter/vf_tinterlace: check clone return value
Inspired by:
3a16ec19d2426457419cb8a7304f97982699efda
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 17:06:22 +0000 (18:06 +0100)]
Merge commit '
3a16ec19d2426457419cb8a7304f97982699efda'
* commit '
3a16ec19d2426457419cb8a7304f97982699efda':
vf_interlace: check one av_frame_clone allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 16:59:47 +0000 (17:59 +0100)]
Merge commit '
c673fc919c374c60b1e6d80d8822712eadf67f16'
* commit '
c673fc919c374c60b1e6d80d8822712eadf67f16':
hevc_sei: drop unused parameter
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 15:52:23 +0000 (16:52 +0100)]
Merge commit '
d234c7a07c1313fd215e8e242492bf71f5f3321e'
* commit '
d234c7a07c1313fd215e8e242492bf71f5f3321e':
mpeg4videodec: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 14:47:44 +0000 (15:47 +0100)]
Merge commit '
8769113accf1f3b78634dec60b37f7354ed6d88d'
* commit '
8769113accf1f3b78634dec60b37f7354ed6d88d':
mpeg4videoenc: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4videoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 13:57:52 +0000 (14:57 +0100)]
swscale/x86/rgb2rgb_template: add mmx/sse2/avx optimized deinterleaveBytes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 13:54:58 +0000 (14:54 +0100)]
swscale/x86/rgb2rgb: change cpu optim identifiers to lower case
This makes the code more similar to the other optims and allows us
to use the same macros to build function names
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 13:46:01 +0000 (14:46 +0100)]
swscale/x86/rgb2rgb: extend framework to also include AVX
This does not yet include any actual AVX code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 13:19:22 +0000 (14:19 +0100)]
swscale: fix used stride in planarToNv12Wrapper()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 13:17:26 +0000 (14:17 +0100)]
swscale: add nv12/nv21->yuv420 converter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 18 Nov 2013 16:02:04 +0000 (17:02 +0100)]
avcodec.h: include version.h before using version macro
Vittorio Giovara [Mon, 11 Nov 2013 00:04:17 +0000 (01:04 +0100)]
vf_interlace: check one av_frame_clone allocation
Vittorio Giovara [Sun, 10 Nov 2013 23:29:51 +0000 (00:29 +0100)]
hevc_sei: drop unused parameter
Vittorio Giovara [Mon, 28 Oct 2013 17:30:13 +0000 (18:30 +0100)]
mpeg4videodec: K&R formatting cosmetics
Vittorio Giovara [Mon, 28 Oct 2013 17:30:01 +0000 (18:30 +0100)]
mpeg4videoenc: K&R formatting cosmetics
Clément Bœsch [Tue, 19 Nov 2013 11:53:14 +0000 (12:53 +0100)]
avformat/jacosubdec: make probing less tolerant.
Fixes a failure with probetest:
./tools/probetest 8192 500000
[...]
Failure of jacosub probing code with score=51 type=1 p=CAB size=16
Random data was:
00000000 40 37 40 30 93 01 48 e0 09 96 10 90 78 0f 0c 10 @7@0..H.....x...
Michael Niedermayer [Tue, 19 Nov 2013 10:34:08 +0000 (11:34 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Don't use symlinks for creating the out of tree makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 19 Nov 2013 09:31:39 +0000 (10:31 +0100)]
doc/examples: fix mem issues in filtering_video.
Martin Storsjö [Thu, 14 Nov 2013 11:22:11 +0000 (13:22 +0200)]
configure: Don't use symlinks for creating the out of tree makefile
On some platforms (such as msys), symlinks are (poorly) emulated
by simply creating a copy of the file.
This means that when building out of tree, the build tree gets
a copy of the original makefile, which can lead to unintuitive
build errors when the original makefile gets updated later.
Instead simply create a stub makefile which includes the real
one.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 19 Nov 2013 03:15:09 +0000 (04:15 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: Fix swapping of UV planes for VCR2
See:
bae14f38d992f326c94d93f01197ccd84ea62053
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 03:09:37 +0000 (04:09 +0100)]
Merge commit '
69d4dbfd1faa99563065329656bbe597d612ca03'
* commit '
69d4dbfd1faa99563065329656bbe597d612ca03':
aac_ac3_parser: simplify an expression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 03:02:41 +0000 (04:02 +0100)]
Merge commit '
37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9'
* commit '
37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9':
dcadec: simplify an expression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Nov 2013 02:48:15 +0000 (03:48 +0100)]
Merge commit '
a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'
* commit '
a553c6a347d3d28d7ee44c3df3d5c4ee780dba23':
lavc: use buf[0] instead of data[0] in checks whether a frame is allocated
Conflicts:
libavcodec/h264_refs.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Wed, 13 Nov 2013 17:44:26 +0000 (18:44 +0100)]
mpegvideo: Fix swapping of UV planes for VCR2
Tim Walker [Mon, 18 Nov 2013 11:41:46 +0000 (12:41 +0100)]
aac_ac3_parser: simplify an expression
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Tim Walker [Mon, 18 Nov 2013 11:41:43 +0000 (12:41 +0100)]
dcadec: simplify an expression
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Mon, 18 Nov 2013 22:21:20 +0000 (23:21 +0100)]
avcodec/asvenc: remove code allocating dummy coded_frame
Fixes memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Nov 2013 19:59:21 +0000 (20:59 +0100)]
avcodec/pcm-dvd: print actual block size values in block size changed warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Nov 2013 19:58:35 +0000 (20:58 +0100)]
avcodec/pcm-dvd: fix incorrectly printed warning about changed block sizes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Nov 2013 19:56:40 +0000 (20:56 +0100)]
avcodec/pcm-dvd: fix 20/24bit 1 channel
Fixes part of ticket3122
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Nov 2013 19:56:40 +0000 (20:56 +0100)]
avcodec/pcm-dvd: fix 20bit 2 channels
Fixes part of ticket3122
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 18 Nov 2013 17:05:30 +0000 (18:05 +0100)]
Add a lavc Makefile dependency for the elbg filter.
Fixes compilation with --disable-encoders
Reported by trac user Julian in ticket #3140.
Anton Khirnov [Fri, 1 Nov 2013 17:07:22 +0000 (18:07 +0100)]
lavc: use buf[0] instead of data[0] in checks whether a frame is allocated
data[0] may be NULL for valid frames with hwaccel pixel formats.
Carl Eugen Hoyos [Mon, 18 Nov 2013 16:51:28 +0000 (17:51 +0100)]
Add a Makefile rule for the little-endian G.726 decoder.
Fixes compilation with --disable-everything --enable-decoder=adpcm_g726le
Carl Eugen Hoyos [Mon, 18 Nov 2013 16:48:17 +0000 (17:48 +0100)]
Add decoder dependency to the HEVC parser.
Fixes compilation with --disable-everything --enable-parser=hevc
Michael Niedermayer [Mon, 18 Nov 2013 15:38:12 +0000 (16:38 +0100)]
avformat/mpegts: fix resync seek
The seek ended up seeking before the begin, which caused problems
Fixes initial sync issues with libbluray
Fixes Ticket3117
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Nov 2013 15:02:09 +0000 (16:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmphttp: Check for both 0 and AVERROR_EOF
Conflicts:
libavformat/rtmphttp.c
See:
d04b7de786780747878c080ba522405c6f542ccb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Valeriy Argunov [Fri, 15 Nov 2013 17:33:43 +0000 (00:33 +0700)]
rtmphttp: Check for both 0 and AVERROR_EOF
This makes RTMPT work again - it was broken by
5d876be87a.
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Fri, 15 Nov 2013 01:09:06 +0000 (01:09 +0000)]
avcodec/libopusenc: change default frame duration to 20 ms
20 ms is used by libopus encoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 18 Nov 2013 09:04:17 +0000 (10:04 +0100)]
avcodec/h261enc: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 18 Nov 2013 07:08:41 +0000 (08:08 +0100)]
avcodec/libxavs: 2nd attempt to fix compilation after
b18c7c8d.
Clément Bœsch [Mon, 18 Nov 2013 06:53:08 +0000 (07:53 +0100)]
avcodec/libxavs: attempt to fix compilation after
b18c7c8d.
Michael Niedermayer [Mon, 18 Nov 2013 02:02:36 +0000 (03:02 +0100)]
avformat/utils: dont count attached pics toward the probesize
Such pics behave more like headers which we also dont count.
Fixes Ticket3146
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vallimar [Mon, 18 Nov 2013 00:21:28 +0000 (01:21 +0100)]
avfilter/vf_mp: fix missing FF_API_XVMC check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vallimar [Mon, 18 Nov 2013 00:21:28 +0000 (01:21 +0100)]
avcodec/old_codec_ids: fix missing FF_API_XVMC check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 17 Nov 2013 22:00:23 +0000 (23:00 +0100)]
avcodec/x86: remove 3 sub in pred4x4_tm_vp8_8.
before:
411 decicycles in ff_pred4x4_tm_vp8_8_ssse3,
8388289 runs, 319 skips
after:
389 decicycles in ff_pred4x4_tm_vp8_8_ssse3,
8388308 runs, 300 skips
Tested on i7 920.
Michael Niedermayer [Sun, 17 Nov 2013 20:20:17 +0000 (21:20 +0100)]
qpeg: remove faulty avcodec_get_frame_defaults()
Found-by: {V}
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 20:14:15 +0000 (21:14 +0100)]
avcodec/mpegaudioenc: prevent overflow in fixed point code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Nov 2013 22:32:51 +0000 (23:32 +0100)]
avutil: reintroduce lls1 as the 52 ABI needs it
lls1 taken from
ff130d7
This is incompatible with libavcodec version
55.18.100 to 55.43.100 except 55.39.101
This incompatibility is caused by these libavcodec versions depending on
a libavutil 52 which is ABI incompatible with the previous ABI 52
you can avoid this incompatibility by upgrading your libavcodec so it
does no longer depend on the invalid ABI
See:
502ab21af0ca68f76d6112722c46d2f35c004053
See:
cc6714bb16b1f0716ba43701d47273dbe9657b8b
See:
41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2
See: Ticket3136
Tested-by: marillat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 15:42:57 +0000 (16:42 +0100)]
rename new lls code to lls2 to avoid conflict with the old which has a different ABI
also remove failed attempt at a compatibility layer, the code simply cannot work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Nov 2013 21:35:46 +0000 (22:35 +0100)]
avutil: rename lls to lls2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 15:00:47 +0000 (16:00 +0100)]
doc/ffmpeg: document qscale and video stream special case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 14:06:28 +0000 (15:06 +0100)]
fate: add h261 trellis quantization test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 14:05:51 +0000 (15:05 +0100)]
avcodec/h261: trellis quantization support
Fixes ticket3143
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 12:27:46 +0000 (13:27 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: use the AVFrame API properly.
ffv1: use the AVFrame API properly.
jpegls: use the AVFrame API properly.
huffyuv: use the AVFrame API properly.
Conflicts:
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Changes to ffv1 are more redone than merged due to them being based on
an ancient codebase and a good part of that having being done already
as well.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 11:41:42 +0000 (12:41 +0100)]
Merge commit '
ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'
* commit '
ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa':
libxvid: use the AVFrame API properly.
pcxenc: use the AVFrame API properly.
roqvideo: remove unused variables
libschroedingerenc: use the AVFrame API properly.
Conflicts:
libavcodec/pcxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 11:33:27 +0000 (12:33 +0100)]
Merge commit '
97168b204a0b6b79bb6c5f0d40efdf7fc2262476'
* commit '
97168b204a0b6b79bb6c5f0d40efdf7fc2262476':
eatgv: use the AVFrame API properly.
libxavs: use the AVFrame API properly.
nuv: use the AVFrame API properly.
flashsvenc: use the AVFrame API properly.
Conflicts:
libavcodec/eatgv.c
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 11:17:05 +0000 (12:17 +0100)]
Merge commit '
57e7b3a89f5a0879ad039e8f04273b48649799a8'
* commit '
57e7b3a89f5a0879ad039e8f04273b48649799a8':
dnxhdenc: use the AVFrame API properly.
libx264: use the AVFrame API properly.
svq1enc: use the AVFrame API properly.
gif: use the AVFrame API properly.
Conflicts:
libavcodec/gif.c
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 11:02:09 +0000 (12:02 +0100)]
Merge commit '
45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7'
* commit '
45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7':
sunrastenc: use the AVFrame API properly.
targaenc: use the AVFrame API properly.
tiffenc: use the AVFrame API properly.
pngenc: use the AVFrame API properly.
Conflicts:
libavcodec/pngenc.c
libavcodec/sunrastenc.c
libavcodec/targaenc.c
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 10:41:26 +0000 (11:41 +0100)]
Merge commit '
0ea430c75b8d90449d2878ad84669a2da2ad3cbc'
* commit '
0ea430c75b8d90449d2878ad84669a2da2ad3cbc':
lclenc: use the AVFrame API properly.
Conflicts:
libavcodec/lclenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 02:31:32 +0000 (03:31 +0100)]
Merge commit '
d48c20630214a4effcc920e93a5044bee4e2002e'
* commit '
d48c20630214a4effcc920e93a5044bee4e2002e':
qtrleenc: use the AVFrame API properly.
ulti: use the AVFrame API properly.
vc1: use the AVFrame API properly.
flashsv: use the AVFrame API properly.
Conflicts:
libavcodec/flashsv.c
libavcodec/qtrleenc.c
libavcodec/ulti.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 02:17:00 +0000 (03:17 +0100)]
Merge commit '
e4155f15b35c4272a235f5521d2dc6c2aabdd462'
* commit '
e4155f15b35c4272a235f5521d2dc6c2aabdd462':
eamad: use the AVFrame API properly.
dpxenc: use the AVFrame API properly.
bmpenc: use the AVFrame API properly.
sgienc: use the AVFrame API properly.
Conflicts:
libavcodec/bmpenc.c
libavcodec/dpxenc.c
libavcodec/eamad.c
libavcodec/sgienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 01:43:57 +0000 (02:43 +0100)]
Merge commit '
730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7'
* commit '
730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7':
mss4: use the AVFrame API properly.
mss3: use the AVFrame API properly.
mss2: use the AVFrame API properly.
mss1: use the AVFrame API properly.
Conflicts:
libavcodec/mss1.c
libavcodec/mss2.c
libavcodec/mss3.c
libavcodec/mss4.c
See:
02fe531afefa7ac3fcc552f8e83461a4bfa7f868
See:
ff1c13b133d548b3ce103f91999b6cc1bb7e65cc
See:
310bf283542ff81a9ec8fa7492fe7d625e80562f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 01:33:49 +0000 (02:33 +0100)]
Merge commit '
508b37557bf36eae83c18e64d42f27b44a321d81'
* commit '
508b37557bf36eae83c18e64d42f27b44a321d81':
tiertexseqv: use the AVFrame API properly.
smc: use the AVFrame API properly.
truemotion2: use the AVFrame API properly.
truemotion1: use the AVFrame API properly.
Conflicts:
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
See:
e999f2339ab0200039ee7123b75d79a52aaac5d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 01:24:27 +0000 (02:24 +0100)]
Merge commit '
4a4841d4e0f0dc50998511bf6c48b518012024db'
* commit '
4a4841d4e0f0dc50998511bf6c48b518012024db':
fraps: use the AVFrame API properly.
rpza: use the AVFrame API properly.
motionpixels: use the AVFrame API properly.
vmdvideo: use the AVFrame API properly.
Conflicts:
libavcodec/fraps.c
libavcodec/motionpixels.c
libavcodec/rpza.c
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 01:09:29 +0000 (02:09 +0100)]
Merge commit '
3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'
* commit '
3c8ea9d4a74fd4d7493d40c818ca64ee492709f3':
vmnc: use the AVFrame API properly.
xan: use the AVFrame API properly.
xxan: use the AVFrame API properly.
zerocodec: use the AVFrame API properly.
Conflicts:
libavcodec/vmnc.c
libavcodec/xan.c
libavcodec/xxan.c
See:
cf5ab8b6f71699a48a6384d5e5779630b4be7b56
See:
ad438f450b83882a1277a79c1c3d6dfe55573b1c
See:
67607e20e882eb5639a4e9099caecb52a863ab68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 00:48:57 +0000 (01:48 +0100)]
Merge commit '
a837c4f2df96a30bf9aa4115b426d608487c7101'
* commit '
a837c4f2df96a30bf9aa4115b426d608487c7101':
zmbvenc: use the AVFrame API properly.
flicvideo: use the AVFrame API properly.
smacker: use the AVFrame API properly.
mmvideo: use the AVFrame API properly.
Conflicts:
libavcodec/flicvideo.c
libavcodec/mmvideo.c
libavcodec/smacker.c
libavcodec/zmbvenc.c
See:
76e27b1d0594199b4b1ff8520312069f42373944
See:
099e57bc38d7e53cf6823dfec349ff9fdaee99ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 00:36:26 +0000 (01:36 +0100)]
Merge commit '
2e09096da912f563c4dd889a8f25c314529bbaa6'
* commit '
2e09096da912f563c4dd889a8f25c314529bbaa6':
kgv1: use the AVFrame API properly.
indeo2: use the AVFrame API properly.
iff: use the AVFrame API properly.
msrle: use the AVFrame API properly.
Conflicts:
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/kgv1dec.c
libavcodec/msrle.c
See:
451b2ca1b4349f9b60416cc057eaf5518d81025c
See:
80e9e63c946660304fc65fa8141ccfdbe4d196d1
See:
057dce5f21cd70db1ef6e3b67644a39f0d51aba5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 00:20:45 +0000 (01:20 +0100)]
Merge commit '
952f943d40e9dbcd68bc851460cc99268091a294'
* commit '
952f943d40e9dbcd68bc851460cc99268091a294':
FATE: add a jv test
Conflicts:
tests/fate/video.mak
tests/ref/fate/jv
See:
7c52070131b7eb7f867fe1eab7383498814826df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 00:16:26 +0000 (01:16 +0100)]
Merge commit '
b7462a3904d71ff799584faf5b875cad59ca2f31'
* commit '
b7462a3904d71ff799584faf5b875cad59ca2f31':
jvdec: use the AVFrame API properly.
Conflicts:
libavcodec/jvdec.c
See:
678431d3f2c5f35fe48b02d5035604ace742be2e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Nov 2013 00:07:37 +0000 (01:07 +0100)]
Merge commit '
2d2a92f72199823a92e4e226c32e42a27ec801c0'
* commit '
2d2a92f72199823a92e4e226c32e42a27ec801c0':
dxa: use the AVFrame API properly.
qpeg: use the AVFrame API properly.
cin video: use the AVFrame API properly.
msvideo1: use the AVFrame API properly.
Conflicts:
libavcodec/dsicinav.c
libavcodec/dxa.c
libavcodec/msvideo1.c
libavcodec/qpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 23:40:59 +0000 (00:40 +0100)]
Merge commit '
a639ea7f4bc44bf6bfa452675558a342924a66a9'
* commit '
a639ea7f4bc44bf6bfa452675558a342924a66a9':
escape124: use the AVFrame API properly.
qtrle: use the AVFrame API properly.
cljr: use the AVFrame API properly.
cinepak: use the AVFrame API properly.
Conflicts:
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/qtrle.c
See:
80e9e63c libavcodec/cinepak.c
See:
71c378984b0bd5470f67c424a79a4750f84d2d3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 23:21:16 +0000 (00:21 +0100)]
Merge commit '
cec5ce49229d61e4eb1f331a6d0dff3aa24f6655'
* commit '
cec5ce49229d61e4eb1f331a6d0dff3aa24f6655':
cdxl: remove an unused variable
c93: use the AVFrame API properly.
bethsoftvid: use the AVFrame API properly.
avs: use the AVFrame API properly.
Conflicts:
libavcodec/bethsoftvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 23:11:33 +0000 (00:11 +0100)]
Merge commit '
6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'
* commit '
6139f481ac9feb1bee4e7d04789fb15d7f24ebbf':
asvenc: use the AVFrame API properly.
a64multienc: use the AVFrame API properly.
Conflicts:
libavcodec/vaapi_mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 23:00:55 +0000 (00:00 +0100)]
Merge commit '
b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d'
* commit '
b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d':
lavc: deprecate avcodec_alloc_frame().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 22:48:16 +0000 (23:48 +0100)]
Merge commit '
5b9c3b4505206143d85398c1410949319fa1180f'
* commit '
5b9c3b4505206143d85398c1410949319fa1180f':
Replace all instances of avcodec_alloc_frame() with av_frame_alloc().
Conflicts:
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
libavcodec/alacenc.c
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/pcm.c
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 22:42:08 +0000 (23:42 +0100)]
Merge commit '
2ff302cb6ba1f159905888026c8a1d7dd8319acf'
* commit '
2ff302cb6ba1f159905888026c8a1d7dd8319acf':
lavc: update coded_frame doxy.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 22:36:33 +0000 (23:36 +0100)]
Merge commit '
b068660ffa73f226cc03a67e214b8540fc1e11c4'
* commit '
b068660ffa73f226cc03a67e214b8540fc1e11c4':
lavc: deprecate CODEC_CAP_NEG_LINESIZES
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 16 Nov 2013 21:47:32 +0000 (22:47 +0100)]
avcodec/vp9: assert on sane size in update_size().
w and h are both read as uint16 + 1 so this can not happen. A similar
change was introduced in
97962b2 /
72ca830, with the
av_log()+AVERROR_INVALIDDATA form, suggesting it could be triggerable
somehow.
Change suggested by Ronald S. Bultje.
Clément Bœsch [Sat, 16 Nov 2013 20:22:06 +0000 (21:22 +0100)]
avcodec/vp9: remove some reset-to-zero from vp9_decode_free().
Those should not be necessary.
Original change by one of these developers:
Anton Khirnov <anton@khirnov.net>
Diego Biurrun <diego@biurrun.de>
Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö <martin@martin.st>
See
97962b2 /
72ca830
Clément Bœsch [Sat, 16 Nov 2013 20:18:53 +0000 (21:18 +0100)]
avcodec/vp9: add a never triggerable assert.
vp8_rac_get_tree() is called with a tree of size 3, so the returned
value can not be outside [0;3]. All of the [0;3] cases are handled in
the switch, so the assert should not be triggerable by any means. A
similar change was introduced in
97962b2 /
72ca830, with the
av_log()+AVERROR_INVALIDDATA form, suggesting it could be triggerable
somehow. This assert might help static analyzer, or simply the reader.
Michael Niedermayer [Sat, 16 Nov 2013 20:47:50 +0000 (21:47 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: calculate last frame duration from vp->pts instead of frame_last_pts
ffplay: simplify early frame drop code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 19:34:05 +0000 (20:34 +0100)]
swscale/swscale_unscaled: fix right column handling in planarCopyWrapper
Found-by: Михаил <Micky53@mail.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 11 Nov 2013 13:02:09 +0000 (15:02 +0200)]
vp9: Ensure that the arithmetic coder values are read in the right order
The operands of an addition can be evaluated in any order, since
the addition isn't a sequence point. The only operators that
have a defined evaluation order are &&, ||, ?: and the sequence
operator ','.
This fixes fate-vp9 on ARM RVCT.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
mpegvideo_enc: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
ffv1: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
jpegls: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
huffyuv: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
libxvid: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
pcxenc: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 13:57:55 +0000 (14:57 +0100)]
roqvideo: remove unused variables
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
libschroedingerenc: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
eatgv: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
libxavs: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
nuv: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
flashsvenc: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
dnxhdenc: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
libx264: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
svq1enc: use the AVFrame API properly.