]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Mon, 31 Mar 2014 00:18:24 +0000 (02:18 +0200)]
Merge commit '
292dbe5e8a95d38c1324b0432fbaca67f8fe4b73 '
* commit '
292dbe5e8a95d38c1324b0432fbaca67f8fe4b73 ':
libmp3lame: add comments about CBR/VBR modes
Conflicts:
libavcodec/libmp3lame.c
See:
07e7bc9cbda12921ddf0ae6bbbf9328f29c3c63e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 31 Mar 2014 00:15:11 +0000 (02:15 +0200)]
Merge commit '
729d821fd864a0568f4068e64d3a70faa23b9309 '
* commit '
729d821fd864a0568f4068e64d3a70faa23b9309 ':
libmp3lame: allow joint stereo to be disabled
Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h
See:
1de11a7cab5346030a134774fbc23b3fc523a003
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 31 Mar 2014 00:08:45 +0000 (02:08 +0200)]
Merge commit '
12789d96361ed8e9804bfbb9db31ea4110e75c58 '
* commit '
12789d96361ed8e9804bfbb9db31ea4110e75c58 ':
mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
Conflicts:
libavformat/isom.c
See:
e21235f9b9e264111279847617bb7bdaa734b11a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 23:55:58 +0000 (01:55 +0200)]
Merge commit '
fce28c3c6d603b7f42a5dbe36bf240d0470469c8 '
* commit '
fce28c3c6d603b7f42a5dbe36bf240d0470469c8 ':
mov: fill in subtitle dimensions after parsing tkhd
See:
8ba432bc56f2d3ef534be7d3ccc1c9b3c0ea3091
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 23:51:34 +0000 (01:51 +0200)]
Merge commit '
96138e8c8da4b9397e627c934a33c22988d1192b '
* commit '
96138e8c8da4b9397e627c934a33c22988d1192b ':
isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
Conflicts:
libavformat/isom.c
See:
b6ad5893ce585ac6d0a5a4750cba6bb700dbc902
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 23:41:21 +0000 (01:41 +0200)]
Merge commit '
9bd4a9f4eec8c8843b54126253bb9d77af95bbb3 '
* commit '
9bd4a9f4eec8c8843b54126253bb9d77af95bbb3 ':
isom: Simplify mov_rewrite_dvd_sub_extradata()
Conflicts:
libavformat/isom.c
See:
f6f3c85c0eff54cebc3a45caa7a1e0454b5c9ff8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 23:31:50 +0000 (01:31 +0200)]
Merge commit '
3e4e2142d246699a1a3a0045ba7124b18bc34d7a '
* commit '
3e4e2142d246699a1a3a0045ba7124b18bc34d7a ':
fate: Convert the paletted output in the brenderpix tests to rgb24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Thu, 24 Oct 2013 03:57:36 +0000 (20:57 -0700)]
libmp3lame: add comments about CBR/VBR modes
Paul B Mahol [Sat, 30 Mar 2013 22:15:50 +0000 (22:15 +0000)]
libmp3lame: allow joint stereo to be disabled
Michael Niedermayer [Thu, 20 Mar 2014 07:05:37 +0000 (07:05 +0000)]
mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
This also moves mov_rewrite_dvd_sub_extradata() to mov.c.
Sample-Id: NeroRecodeSample.mp4
Michael Niedermayer [Thu, 20 Mar 2014 07:05:36 +0000 (07:05 +0000)]
mov: fill in subtitle dimensions after parsing tkhd
Sample-Id: NeroRecodeSample.mp4
Michael Niedermayer [Thu, 20 Mar 2014 07:05:35 +0000 (07:05 +0000)]
isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
Sample-Id: NeroRecodeSample.mp4
Michael Niedermayer [Thu, 20 Mar 2014 07:05:34 +0000 (07:05 +0000)]
isom: Simplify mov_rewrite_dvd_sub_extradata()
This avoids the 2nd buffer and fixes the palette truncated check
Martin Storsjö [Sun, 30 Mar 2014 18:27:58 +0000 (18:27 +0000)]
fate: Convert the paletted output in the brenderpix tests to rgb24
This makes the output consistent on big-endian systems.
Matt Oliver [Sun, 30 Mar 2014 01:34:49 +0000 (12:34 +1100)]
Use intel compliant CDQ instead of CLTD in inline asm.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Sun, 30 Mar 2014 19:14:17 +0000 (21:14 +0200)]
doc/indevs: Fix example for QTKit usage.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 19:19:40 +0000 (21:19 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: make the ASCII flow charts narrower to fit onto TTY
Conflicts:
doc/ffmpeg.texi
See:
8fe107609437909ddd2cf8f5690fe0158a0616f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 19:08:45 +0000 (21:08 +0200)]
Merge commit '
68e95ab81be1aa3f47ab148dceb8711ef5f4212d '
* commit '
68e95ab81be1aa3f47ab148dceb8711ef5f4212d ':
dnxhdenc: return meaningful return codes
Conflicts:
libavcodec/dnxhdenc.c
See:
b9bedb0b287d3aaa30540d18fdb87b2cc98ca339
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 18:58:45 +0000 (20:58 +0200)]
Merge commit '
9e4e35b4d7c43a908944183a58aa389a23116fd6 '
* commit '
9e4e35b4d7c43a908944183a58aa389a23116fd6 ':
avconv_opt: fix avio_open2() return code check
See:
774239be717150909219ad2c0696bfb6a50cf2cb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vadim Kalinsky [Mon, 24 Mar 2014 09:55:35 +0000 (10:55 +0100)]
lavd: Add QTKit input device.
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 7 Feb 2014 00:20:58 +0000 (16:20 -0800)]
avconv: make the ASCII flow charts narrower to fit onto TTY
These charts in man page are currently destroyed.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Peter Ross [Sun, 30 Mar 2014 01:42:05 +0000 (12:42 +1100)]
avformat/wtvenc: advise user when H264 startcode is not present
Fixes ticket #3473.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 30 Mar 2014 01:41:01 +0000 (12:41 +1100)]
avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcode
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 12:51:59 +0000 (14:51 +0200)]
avformat/avio: also set generic URL context options
This should have no effect currently as there are no such options yet.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 12:58:46 +0000 (14:58 +0200)]
avutil/opt: dont crash on av_opt_set_dict() with NULL
This allows calling the function without the need to check if the
dictionary contains any entries
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 29 Mar 2014 20:59:46 +0000 (20:59 +0000)]
dnxhdenc: return meaningful return codes
Timothy Gu [Sat, 29 Mar 2014 20:59:45 +0000 (20:59 +0000)]
avconv_opt: fix avio_open2() return code check
avio_open2() only return < 0 when error.
Peter Ross [Sun, 30 Mar 2014 01:43:50 +0000 (12:43 +1100)]
avformat/wtvenc: pad judiciously when writing mpeg2 extradata
Padding rule described here http://msdn.microsoft.com/en-us/library/windows/desktop/
dd390707 (v=vs.85).aspx
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 30 Mar 2014 01:43:19 +0000 (12:43 +1100)]
avformat/wtvdec: demux mpeg2 extradata
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 01:23:13 +0000 (03:23 +0200)]
avformat/replaygain: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 01:02:43 +0000 (03:02 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
golomb: Fix the implementation of get_se_golomb_long
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Mar 2014 00:39:46 +0000 (01:39 +0100)]
Merge commit '
53c20f17c78d1d8a0fc2505868f201e69ff59cc5 '
* commit '
53c20f17c78d1d8a0fc2505868f201e69ff59cc5 ':
vp8: K&R formatting cosmetics
Conflicts:
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 29 Mar 2014 10:35:11 +0000 (12:35 +0200)]
golomb: Fix the implementation of get_se_golomb_long
This was only used in hevc muxing code so far.
This makes the return values match what get_se_golomb returns for
the same bitstream reader instances.
The logic for producing a signed golomb code out of an unsigned one
was based on the corresponding code in get_se_golomb, which operated
directly on the bitstream reader buffer - not on the equivalent
return value from get_ue_golomb.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Clément Bœsch [Sat, 29 Mar 2014 16:28:37 +0000 (17:28 +0100)]
avcodec/vp9dsp: fix typo in mc doxy.
Clément Bœsch [Fri, 28 Mar 2014 21:33:51 +0000 (22:33 +0100)]
x86/vp9mc: add vp9 namespace.
Michael Niedermayer [Sat, 29 Mar 2014 15:28:28 +0000 (16:28 +0100)]
Merge commit 'lukaszmluki/master^'
* commit 'lukaszmluki/master^':
lavd/pulse_audio_enc: implement get_device_list callback
lavd/pulse_audio_dec: implement get_device_list callback
lavd/pulse_audio_common: add device detecting code
lavu/mem: add av_dynarray_add_nofree function
lavd/pulse_audio_enc: implement write_uncoded_frame callback
tools/uncoded_frame: fix audio codec generation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Fri, 28 Mar 2014 00:13:54 +0000 (01:13 +0100)]
vp8: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Sat, 29 Mar 2014 14:38:20 +0000 (15:38 +0100)]
avformat/movenc: fix if vs if else
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Mar 2014 14:03:24 +0000 (15:03 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Add dvd subtitle support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Mar 2014 13:33:10 +0000 (14:33 +0100)]
Merge commit '
85698be461c07be10d873dd34348bcfe9ffc56e0 '
* commit '
85698be461c07be10d873dd34348bcfe9ffc56e0 ':
cmdutils: Mark exit_program as av_noreturn
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Tue, 25 Feb 2014 00:04:15 +0000 (01:04 +0100)]
lavd/pulse_audio_enc: implement get_device_list callback
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Tue, 25 Feb 2014 00:04:02 +0000 (01:04 +0100)]
lavd/pulse_audio_dec: implement get_device_list callback
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Tue, 25 Feb 2014 00:03:56 +0000 (01:03 +0100)]
lavd/pulse_audio_common: add device detecting code
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Tue, 25 Feb 2014 00:06:06 +0000 (01:06 +0100)]
lavu/mem: add av_dynarray_add_nofree function
av_dynarray_add_nofree function have similar functionality
as existing av_dynarray_add, but it doesn't deallocate memory
on fails.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Mon, 24 Mar 2014 16:55:07 +0000 (17:55 +0100)]
lavd/pulse_audio_enc: implement write_uncoded_frame callback
Provided implementation doesn't support planar formats yet.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Mon, 24 Mar 2014 16:49:04 +0000 (17:49 +0100)]
tools/uncoded_frame: fix audio codec generation
Codec id is guessed from uninitialized sample format.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Michael Niedermayer [Sat, 29 Mar 2014 03:25:50 +0000 (04:25 +0100)]
avcodec/vp7: check buffer size
Fixes overread
Fixes Ticket 3501
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Mar 2014 02:18:45 +0000 (03:18 +0100)]
avcodec/xbmdec: redesign parser to handle more cases
The new code is more tolerant on the syntax
Fixes decoding of bm1.xbm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 23:16:43 +0000 (00:16 +0100)]
avformat/img2_alias_pix: rewrite probe function
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 23:18:56 +0000 (00:18 +0100)]
avformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix probing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 16:24:48 +0000 (17:24 +0100)]
avformat/img2dec: Use avformat probing interface to identify format if it has not been otherwise identified
This is used only for distinguishing .pix formats for now.
Which is the only case that has image2 demuxers currently
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 16:24:10 +0000 (17:24 +0100)]
avformat: add image2 brender pix demuxer
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 16:23:32 +0000 (17:23 +0100)]
avformat: add image2 alias pix demuxer
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 20:03:14 +0000 (21:03 +0100)]
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>
Michael Niedermayer [Fri, 28 Mar 2014 15:10:10 +0000 (16:10 +0100)]
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>
Michael Niedermayer [Fri, 28 Mar 2014 15:03:33 +0000 (16:03 +0100)]
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>
John Stebbins [Tue, 18 Mar 2014 14:50:25 +0000 (08:50 -0600)]
movenc: Add dvd subtitle support
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Fri, 28 Mar 2014 11:41:15 +0000 (12:41 +0100)]
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>
Michael Niedermayer [Fri, 28 Mar 2014 10:32:51 +0000 (11:32 +0100)]
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>
Michael Niedermayer [Fri, 28 Mar 2014 09:59:16 +0000 (10:59 +0100)]
Merge commit '
fb5cf145b6bcfa4f83af94398e5560c1132cc410 '
* commit '
fb5cf145b6bcfa4f83af94398e5560c1132cc410 ':
bmp: add a standalone parser
Conflicts:
Changelog
libavcodec/bmp_parser.c
libavcodec/version.h
See:
011ce89dba5c0c764abc5f39acb6368f580742e3 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 04:49:22 +0000 (05:49 +0100)]
Merge commit '
991362fab49b60d34d89b7b7d6dd00fbec3ce022 '
* commit '
991362fab49b60d34d89b7b7d6dd00fbec3ce022 ':
fate: add XBM tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 04:34:25 +0000 (05:34 +0100)]
avcodec/xbmdec: support X10 format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 04:33:13 +0000 (05:33 +0100)]
avcodec/xbmdec: merge ptr increase into dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 04:23:46 +0000 (05:23 +0100)]
Merge commit '
678082b409aca711f9cf991df6b0200116489322 '
* commit '
678082b409aca711f9cf991df6b0200116489322 ':
X-Bitmap decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavcodec/xbmdec.c
See:
a0340dfbd78df7639715056937011d2d414aaeed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 03:45:24 +0000 (04:45 +0100)]
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>
Michael Niedermayer [Fri, 28 Mar 2014 03:41:16 +0000 (04:41 +0100)]
Merge commit '
a7a5e3850ecd94e726ad2272295b9e6c91841cf8 '
* commit '
a7a5e3850ecd94e726ad2272295b9e6c91841cf8 ':
fate: add PAF audio and video tests
Conflicts:
tests/fate/audio.mak
tests/fate/video.mak
See:
101615c7ff37afe5e6a951838cbbbb92b7485473
See:
409cc4588329633326b32a5245b085c543689471
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 03:31:42 +0000 (04:31 +0100)]
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:
7de4a16508cb9bd2d40855f7114dea14329ef62a , and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 02:26:43 +0000 (03:26 +0100)]
Merge commit '
d37c96213a2a9e1fd8669122d5405f4ce6a99ed8 '
* commit '
d37c96213a2a9e1fd8669122d5405f4ce6a99ed8 ':
lavc: restore copy_block{4,16} functions
Conflicts:
libavcodec/copy_block.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 27 Mar 2014 23:40:43 +0000 (00:40 +0100)]
cmdutils: Mark exit_program as av_noreturn
rogerdpack [Thu, 27 Mar 2014 19:44:20 +0000 (13:44 -0600)]
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>
Vittorio Giovara [Mon, 17 Mar 2014 14:30:05 +0000 (15:30 +0100)]
fate: add a bmpparser test
Paul B Mahol [Sun, 5 Aug 2012 23:46:41 +0000 (23:46 +0000)]
bmp: add a standalone parser
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Thu, 27 Mar 2014 23:03:38 +0000 (00:03 +0100)]
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>
Vittorio Giovara [Mon, 17 Mar 2014 00:24:30 +0000 (01:24 +0100)]
fate: add XBM tests
Vittorio Giovara [Sat, 22 Mar 2014 04:33:27 +0000 (05:33 +0100)]
X-Bitmap decoder
Vittorio Giovara [Mon, 17 Mar 2014 00:20:53 +0000 (01:20 +0100)]
xbm: use av_frame_free on close
Paul B Mahol [Sun, 8 Jul 2012 22:16:12 +0000 (22:16 +0000)]
fate: add PAF audio and video tests
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Paul B Mahol [Fri, 21 Mar 2014 16:28:47 +0000 (16:28 +0000)]
PAF demuxer and decoder
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Vittorio Giovara [Mon, 10 Mar 2014 16:05:12 +0000 (17:05 +0100)]
lavc: restore copy_block{4,16} functions
They were removed in
9e31729d692f1e721b7ed1a3a0f51b68c064d68f .
Timothy Gu [Thu, 27 Mar 2014 02:06:30 +0000 (19:06 -0700)]
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>
Timothy Gu [Thu, 27 Mar 2014 02:06:29 +0000 (19:06 -0700)]
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>
Michael Niedermayer [Thu, 27 Mar 2014 21:14:26 +0000 (22:14 +0100)]
avcodec: Make ff_print_debug_info2() independant of Picture struct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 21:07:49 +0000 (22:07 +0100)]
avcodec/brenderpix: propagate error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 21:06:59 +0000 (22:06 +0100)]
avcodec/brenderpix: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 20:32:38 +0000 (21:32 +0100)]
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>
Michael Niedermayer [Thu, 27 Mar 2014 20:03:35 +0000 (21:03 +0100)]
Merge commit '
ae17878fb2ab100264226c84c58f5b95a703312f '
* commit '
ae17878fb2ab100264226c84c58f5b95a703312f ':
BRender PIX image decoder
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
See:
492a5f835c59ab7c2e347d3579d8bf6148ae0a0 , and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 19:10:51 +0000 (20:10 +0100)]
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>
Vittorio Giovara [Wed, 26 Mar 2014 23:52:13 +0000 (00:52 +0100)]
fate: add BRender PIX tests
Aleksi Nurmi [Wed, 26 Mar 2014 23:45:15 +0000 (00:45 +0100)]
BRender PIX image decoder
Further enhancements by Vittorio Giovara and Paul B Mahol.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diego Biurrun [Thu, 27 Mar 2014 09:56:07 +0000 (10:56 +0100)]
arm: build: Maintain decoder objects separate from infrastructure objects
Michael Niedermayer [Thu, 27 Mar 2014 03:40:48 +0000 (04:40 +0100)]
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>
Michael Niedermayer [Thu, 27 Mar 2014 03:23:15 +0000 (04:23 +0100)]
configure: fix VP7 standalone build
Found-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Wed, 26 Mar 2014 18:24:35 +0000 (19:24 +0100)]
Fix spelling errors in texi files: more informations --> more information allows to --> allows one to
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Wed, 26 Mar 2014 18:13:35 +0000 (19:13 +0100)]
Fix texinfo error due to wrong @subsubsection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 00:59:32 +0000 (01:59 +0100)]
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>
Michael Niedermayer [Thu, 27 Mar 2014 00:10:28 +0000 (01:10 +0100)]
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>
Michael Niedermayer [Wed, 26 Mar 2014 22:58:48 +0000 (23:58 +0100)]
libavformat/aviobuf: keep track of the original buffer-size and restore it after probe/ensure-seekback
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 22:52:09 +0000 (23:52 +0100)]
avformat/aviobuf: ffio_ensure_seekback: only copy the initialized part of the buffer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Thu, 20 Mar 2014 02:12:18 +0000 (03:12 +0100)]
fate: add Alias PIX tests
Vittorio Giovara [Thu, 20 Mar 2014 00:15:25 +0000 (01:15 +0100)]
Alias PIX image encoder and decoder