Michael Niedermayer
95482092b1
Merge commit '8c0a865ad96b9e8542051f75b0edc424cb73994e'
...
* commit '8c0a865ad96b9e8542051f75b0edc424cb73994e':
mov: skip version and flags attributes in mov_read_chan()
See: 59d40fc7e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 01:23:09 +01:00
Lukasz Marek
8616c5b75a
lavc/options: fix leaks in avcodec_copy_context
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-12-06 01:01:15 +01:00
Michael Niedermayer
66f379da15
Merge commit 'b72727a5248f1ef02db99b378dce1eb48a46357a'
...
* commit 'b72727a5248f1ef02db99b378dce1eb48a46357a':
lavc: mention that the parser callback never returns an error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 00:52:42 +01:00
Michael Niedermayer
03abf55f25
avformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 00:49:23 +01:00
Michael Niedermayer
50f9de59a0
avformat/rmdec: rm_read_extradata: add error message for oversized extradata
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 00:49:20 +01:00
Michael Niedermayer
ef2f9073dd
Merge commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4'
...
* commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4':
rm: Use the correct codec_data_size signedness
Conflicts:
libavformat/rm.h
libavformat/rmdec.c
See: a6f730730b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 00:48:47 +01:00
Michael Niedermayer
a0d0799ea2
Merge commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9'
...
* commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9':
APIchanges: mark the release 11 branch point
Conflicts:
doc/APIchanges
Not merged as the contents in our APIchanges differ and it could be confusing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 00:37:25 +01:00
Lukasz Marek
53b2809f2c
lavc/options: don't copy priv context when it is not AVOption object
...
This prevents potential crash when opt API is used without a class.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-12-06 00:05:18 +01:00
Michael Niedermayer
95f719fb8f
Merge commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff'
...
* commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff':
mkv: Validate ASS Start and End fields
Conflicts:
libavformat/matroskaenc.c
No change as the changed code is not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 23:32:40 +01:00
Michael Niedermayer
fa4c3130ee
Merge commit '7834a54c66d46471b246b411627efe2e8ef9dd47'
...
* commit '7834a54c66d46471b246b411627efe2e8ef9dd47':
configure: enable vda hwaccel by default
Conflicts:
configure
See: 942cded690
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 23:20:47 +01:00
Michael Niedermayer
d94a475c59
Merge commit '894545cb717427a47f800dc7738b923afde139a6'
...
* commit '894545cb717427a47f800dc7738b923afde139a6':
mpegvideo: exit cleanly when ff_mpv_common_frame_size_change() fails
See: cfce6f7efd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 23:08:40 +01:00
Michael Niedermayer
2e59e6ff68
Merge commit '7a38987f245e3c280d81442f207b983333b6233c'
...
* commit '7a38987f245e3c280d81442f207b983333b6233c':
mpegvideo: free_context_frame() cannot fail, make it return void
See: 94c61cd9ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 23:07:20 +01:00
Michael Niedermayer
9222a176e1
Merge commit 'c45eeb2dbf42382d335da8068231a8026c08843b'
...
* commit 'c45eeb2dbf42382d335da8068231a8026c08843b':
mpegvideo: replace assert about interlaced EC with debug av_log()
Conflicts:
libavcodec/mpegvideo.c
See: c88bbc01eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 22:48:47 +01:00
Michael Niedermayer
9d921cce4f
Merge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb'
...
* commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb':
mpeg12dec: Use more specific error codes
Conflicts:
libavcodec/mpeg12dec.c
See: 1852b2a0f4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 22:21:56 +01:00
Michael Niedermayer
bcc43de51f
Merge commit 'b56afb48aecb96e03347f5b569f16a64147c18b1'
...
* commit 'b56afb48aecb96e03347f5b569f16a64147c18b1':
mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()
Conflicts:
libavcodec/mpeg12dec.c
See: 88b4c1a731
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 22:10:12 +01:00
Michael Niedermayer
81f116d31c
Merge commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d'
...
* commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d':
exr: Add a gamma flag to exr loader to avoid banding
Conflicts:
libavcodec/exr.c
See: cd3daad77e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 21:58:33 +01:00
Michael Niedermayer
47c066f22e
Merge commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3'
...
* commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3':
h264: proper cleanup in ff_h264_alloc_tables() if DPB alloc fails
See: 949057c958
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 21:43:24 +01:00
Michael Niedermayer
7a64f16841
Merge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0'
...
* commit '56de2897a68e3a8795b0b3c593dad1c5832696e0':
h264: Fix memory leak on ff_h264_decode_init() failure
Conflicts:
libavcodec/h264.c
See: 309a931a38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 21:41:01 +01:00
Michael Niedermayer
4ba0141921
avcodec/dvbsubdec: Pass context to av_log()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 20:33:57 +01:00
Michael Niedermayer
b0ae362a21
avcodec/golomb: use NULL for pointers instead of 0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 20:27:04 +01:00
Piotr Fusik
c99e5191ab
doc/examples/filtering_video: fix frame rate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 16:52:19 +01:00
Rafaël Carré
57bfafe76b
avformat/mpegts: fix Opus stream count
...
That number represents the number of streams, not the number of channels
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 16:00:11 +01:00
Kieran Kunhya
9a738c27dc
v210enc: Add SIMD optimised 8-bit and 10-bit encoders
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-12-05 13:03:49 +00:00
Derek Buitenhuis
33c827f632
swscale: Properly scale YUV
...
Only shift limited range luma, and always only shift chroma
for upconversion.
Based off a patch by Michael Niedermayer.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-12-05 13:03:49 +00:00
Matthieu Bouron
8c0a865ad9
mov: skip version and flags attributes in mov_read_chan()
...
Fixes decting channel layout for files with uncommon audio, such as
FL and FR in two separate streams. Introduced in 3bab7cd
.
CC: libav-devel@libav.org
Sample-Id: ticket1474.mov
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-12-05 13:03:49 +00:00
Michael Niedermayer
a7ebd0b011
avcodec/mpegaudiodec_template: only allocate fdsp when its used
...
Fixes memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 04:27:49 +01:00
Lukasz Marek
4a0b1d9245
lavc/libxvid: workaround for bug in libxvidcore
...
libxvidcore calculate number of threads basing on video height.
If height is small enough it allocates 0 bytes long memory and
writes to it.
Setting thread_count to 0 uses 1 thread and skips bugged code.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-05 03:29:28 +01:00
Vittorio Giovara
b72727a524
lavc: mention that the parser callback never returns an error
2014-12-05 00:44:42 +00:00
Mark Reid
4f69477870
libavformat/mxfdec.c refactor resolving MultiDescriptor and remove essence group hack
...
I think this is a better way to deal with single frame essence data then my
previous way.
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 23:31:37 +01:00
Steve Jiekak
a32c3c2392
replaced av_dv_codec_profile by av_dv_codec_profile2 in encoder and dv muxers
...
Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 20:24:00 +01:00
Steve Jiekak
6e9ac02af8
add av_dv_codec_profile2 : uses framerate to select best matching profile. default on first matching profile
...
Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 20:23:52 +01:00
Michael Niedermayer
bde27e1e61
doc/examples/transcoding: check encoder before using it
...
Fixes null pointer exception
Found-by: stoupeace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 18:58:38 +01:00
Michael Niedermayer
cbf09545f2
avcodec/imc: only check remaining bits in case bits will be read
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 18:24:50 +01:00
Christophe Gisquet
291747581e
imc: make issue non-fatal
...
The "faulty" samples actually sound fine when ignoring this issue.
For ticket #3886 , more samples are decoded.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 18:24:33 +01:00
Benoit Fouet
0f6931f4b6
avcodec/pngdec: use memcpy instead of byte loops for P frames.
...
Rely on the way memcpy is optimized for one's system instead of looping
on a byte buffer for buffer copies to handle P frames.
Tested-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 17:01:04 +01:00
Michael Niedermayer
a4f21a8dd9
MAINTAINERS: add 2.5
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 14:24:59 +01:00
Luca Barbato
1c77ead1fb
rm: Use the correct codec_data_size signedness
...
The function takes a size and not an offset.
CC: libav-stable@libav.org
Sample-Id: rm_deadlock.rm
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-12-04 13:14:28 +00:00
Rong Yan
d23e883248
avcodec/ppc/vp8dsp_altivec.c: POWER LE support put_vp8_epel_h_altivec_core() put_vp8_epel_v_altivec_core() put_vp8_pixels16_altivec() add marcos GET_PIXHL() GET_OUTER() LOAD_HL()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 13:35:06 +01:00
Rong Yan
36cd2bcbc3
avcodec/ppc/vc1dsp_altivec: add POWER LE support to vc1_inv_trans_8x4_altivec()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 11:47:23 +01:00
Timothy Gu
af14ae8037
RELEASE: Bump
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 11:44:35 +01:00
Michael Niedermayer
5fe026f2bd
avcodec/aacdec: reduce noisiness of missing channel elements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 01:52:32 +01:00
Michael Niedermayer
8d87c0b3ad
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Fix standalone compilation of the iec61883 input device.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 01:52:01 +01:00
Carl Eugen Hoyos
963aa1daf8
Fix standalone compilation of the iec61883 input device.
2014-12-04 01:35:47 +01:00
Michael Niedermayer
0f16ab18db
doc/APIchanges: add 2.5 cut marker
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 01:28:40 +01:00
Michael Niedermayer
f478bdabf2
Changelog: add 2.5 entry
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 01:28:06 +01:00
Benoit Fouet
1d69ab9d1c
avcodec/pngdec: fix indentation in handle_row()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 00:31:11 +01:00
Benoit Fouet
6e9b060e4f
avcodec/pngdec: fix mem leak in init()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 00:30:54 +01:00
Benoit Fouet
08aec6f68e
libavcodec/pngdec: support 'previous' dispose operation for APNG.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04 00:30:38 +01:00
Reimar Döffinger
49d9cbe55d
h264_i386: Fix operand size
...
Fixes fate failure on macosx clang x86-64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-03 23:03:13 +01:00
Michael Niedermayer
dac9e50902
RELEASE_NOTES: update for 2.5
...
If you spot something missing wrong or improvable, do not hesitate
to push fixes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-03 22:40:02 +01:00