Michael Niedermayer
067a9cf81a
avformat/img2dec: make image2dec capable to be used from seperate demuxers
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 23:54:51 +01:00
Michael Niedermayer
de96e20be9
avfilter/lavfutils: call av_find_stream_info() before reading various information about the stream
...
No testcase with unmodified source is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 17:29:26 +01:00
Michael Niedermayer
2b4543ff69
cmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONE
...
This fixes cases where the codec is detect later than the stream creation
No testcase with unmodified source known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 17:29:26 +01:00
John Stebbins
6adf3bc42e
movenc: Add dvd subtitle support
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-28 17:15:30 +01:00
Michael Niedermayer
92005c2636
fate/aliaspix: Use standard test sample
...
This also uses samples with odd resolution which should provide better coverage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 12:55:54 +01:00
Michael Niedermayer
e1d1001703
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add a bmpparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 12:03:23 +01:00
Michael Niedermayer
a696b0917d
Merge commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410'
...
* commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410':
bmp: add a standalone parser
Conflicts:
Changelog
libavcodec/bmp_parser.c
libavcodec/version.h
See: 011ce89dba
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 11:00:27 +01:00
Michael Niedermayer
2b570c9569
Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'
...
* commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022':
fate: add XBM tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 05:50:38 +01:00
Michael Niedermayer
1da1866767
avcodec/xbmdec: support X10 format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 05:34:25 +01:00
Michael Niedermayer
4618084a5c
avcodec/xbmdec: merge ptr increase into dereference
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 05:33:13 +01:00
Michael Niedermayer
296e63efa5
Merge commit '678082b409aca711f9cf991df6b0200116489322'
...
* commit '678082b409aca711f9cf991df6b0200116489322':
X-Bitmap decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavcodec/xbmdec.c
See: a0340dfbd7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 05:26:24 +01:00
Michael Niedermayer
6bd05ed8bb
Merge commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4'
...
* commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4':
xbm: use av_frame_free on close
Conflicts:
libavcodec/xbmenc.c
No change as the buggy code is not part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 04:45:24 +01:00
Michael Niedermayer
8a8472dd49
Merge commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8'
...
* commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8':
fate: add PAF audio and video tests
Conflicts:
tests/fate/audio.mak
tests/fate/video.mak
See: 101615c7ff
See: 409cc45883
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 04:44:25 +01:00
Michael Niedermayer
16ddc58bd7
Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'
...
* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033':
PAF demuxer and decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/paf.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/paf.c
libavformat/version.h
See: 7de4a16508
, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 04:32:05 +01:00
Michael Niedermayer
03e4c2d833
Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'
...
* commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8':
lavc: restore copy_block{4,16} functions
Conflicts:
libavcodec/copy_block.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 03:26:43 +01:00
Luca Barbato
85698be461
cmdutils: Mark exit_program as av_noreturn
2014-03-28 00:40:43 +01:00
rogerdpack
773eb74bab
dshow: show device name when outputting buffer overflow log message
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 00:22:55 +01:00
Vittorio Giovara
e8e560f2a2
fate: add a bmpparser test
2014-03-28 00:08:24 +01:00
Paul B Mahol
fb5cf145b6
bmp: add a standalone parser
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-28 00:08:24 +01:00
Michael Niedermayer
64b79141bd
avcodec/libx264: move where x264opts is applied down so it isnt overridden by avctx & defaults
...
fixes x264opts opengop=1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 00:05:33 +01:00
Vittorio Giovara
991362fab4
fate: add XBM tests
2014-03-27 23:59:13 +01:00
Vittorio Giovara
678082b409
X-Bitmap decoder
2014-03-27 23:59:13 +01:00
Vittorio Giovara
792e4c21f2
xbm: use av_frame_free on close
2014-03-27 23:57:51 +01:00
Paul B Mahol
a7a5e3850e
fate: add PAF audio and video tests
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-27 23:34:47 +01:00
Paul B Mahol
70daeacd6e
PAF demuxer and decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-27 23:34:47 +01:00
Vittorio Giovara
d37c96213a
lavc: restore copy_block{4,16} functions
...
They were removed in 9e31729d69
.
2014-03-27 23:25:39 +01:00
Timothy Gu
9d34dce05b
x86: convert DNxHDenc inline asm to yasm
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 23:16:17 +01:00
Timothy Gu
cb11b9e89e
dnxhdenc: make get_pixel_8x4_sym accept ptrdiff_t as stride
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 23:09:10 +01:00
Michael Niedermayer
72bff8da47
avcodec: Make ff_print_debug_info2() independant of Picture struct
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 22:43:05 +01:00
Michael Niedermayer
a4f27a3f57
avcodec/brenderpix: propagate error codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 22:07:49 +01:00
Michael Niedermayer
8506423318
avcodec/brenderpix: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 22:06:59 +01:00
Michael Niedermayer
09ebd87a34
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add BRender PIX tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 21:33:41 +01:00
Michael Niedermayer
f392949f1a
Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'
...
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f':
BRender PIX image decoder
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
See: 492a5f835c
, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 21:09:17 +01:00
Michael Niedermayer
68014c6ed9
Merge commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7'
...
* commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7':
arm: build: Maintain decoder objects separate from infrastructure objects
Conflicts:
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 20:10:51 +01:00
Vittorio Giovara
bb36b9aa7e
fate: add BRender PIX tests
2014-03-27 18:27:23 +01:00
Aleksi Nurmi
ae17878fb2
BRender PIX image decoder
...
Further enhancements by Vittorio Giovara and Paul B Mahol.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-27 18:27:23 +01:00
Diego Biurrun
c3a0b3eb64
arm: build: Maintain decoder objects separate from infrastructure objects
2014-03-27 03:00:05 -07:00
Michael Niedermayer
57e939d963
avcodec/vp7: Fix null pointer dereference in vp7_decode_frame_header()
...
This simply copies the "interframe without a prior keyframe" check
thats done later into vp7_decode_frame_header()
Found-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 05:02:18 +01:00
Michael Niedermayer
d5c9843cd2
configure: fix VP7 standalone build
...
Found-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 04:23:59 +01:00
Andreas Cadhalpun
d473f2d18a
Fix spelling errors in texi files: more informations --> more information allows to --> allows one to
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 03:58:56 +01:00
Andreas Cadhalpun
cf3bfc970c
Fix texinfo error due to wrong @subsubsection
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 03:58:29 +01:00
Michael Niedermayer
62094e2fdd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add Alias PIX tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 01:59:32 +01:00
Michael Niedermayer
12ab07be44
Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
...
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b':
Alias PIX image encoder and decoder
Conflicts:
Changelog
libavcodec/allcodecs.c
libavcodec/version.h
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 01:10:28 +01:00
Michael Niedermayer
61b5ef7754
libavformat/aviobuf: keep track of the original buffer-size and restore it after probe/ensure-seekback
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26 23:58:48 +01:00
Michael Niedermayer
0d4a66ee7f
avformat/aviobuf: ffio_ensure_seekback: only copy the initialized part of the buffer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26 23:52:38 +01:00
Vittorio Giovara
9718c31ef6
fate: add Alias PIX tests
2014-03-26 23:25:02 +01:00
Vittorio Giovara
e50f5d3cf9
Alias PIX image encoder and decoder
2014-03-26 23:25:02 +01:00
Michael Niedermayer
50b68e323c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
truehd: add hand-scheduled ARM asm version of ff_mlp_pack_output.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26 21:23:09 +01:00
Michael Niedermayer
fc64e128f0
Merge commit 'b9eb03416d93a5c4ece27ffef5e6e11c81bec6fa'
...
* commit 'b9eb03416d93a5c4ece27ffef5e6e11c81bec6fa':
truehd: break out part of output_data into platform-specific callback.
Conflicts:
libavcodec/mlpdec.c
See: b01a2562ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26 21:00:27 +01:00
Michael Niedermayer
179cf14832
Merge commit 'fcf5fc444522d24caa9907225802817ae788f511'
...
* commit 'fcf5fc444522d24caa9907225802817ae788f511':
truehd: tune VLC decoding for ARM.
Conflicts:
libavcodec/mlpdec.c
See: e555e1bc39
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26 20:58:03 +01:00