generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,130 Commits 24 Branches 241 Tags 173 MiB
0f62982335
Commit Graph

62130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
bcd5fd5346 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>
 2014-03-29 17:07:26 +01:00
Vittorio Giovara
53c20f17c7 vp8: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-03-29 16:11:09 +01:00
Michael Niedermayer
8a9d0a1561 avformat/movenc: fix if vs if else 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-29 15:38:20 +01:00
Michael Niedermayer
b8f5b0713e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Add dvd subtitle support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-29 15:04:56 +01:00
Michael Niedermayer
d840266633 Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0' 
* commit '85698be461c07be10d873dd34348bcfe9ffc56e0':
  cmdutils: Mark exit_program as av_noreturn

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-29 14:33:39 +01:00
Lukasz Marek
3937b40e87 lavd/pulse_audio_enc: implement get_device_list callback 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-29 09:54:16 +01:00
Lukasz Marek
255cf03af8 lavd/pulse_audio_dec: implement get_device_list callback 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-29 09:54:09 +01:00
Lukasz Marek
85ed32d2ed lavd/pulse_audio_common: add device detecting code 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-29 09:48:56 +01:00
Lukasz Marek
cd50a44beb 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>
 2014-03-29 09:48:48 +01:00
Lukasz Marek
27256e69ab 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>
 2014-03-29 09:26:10 +01:00
Lukasz Marek
fd786bad63 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>
 2014-03-29 09:25:14 +01:00
Michael Niedermayer
46f72ea507 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>
 2014-03-29 04:27:00 +01:00
Michael Niedermayer
067ada04d1 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>
 2014-03-29 03:50:25 +01:00
Michael Niedermayer
657cee1aef avformat/img2_alias_pix: rewrite probe function 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-29 00:38:51 +01:00
Michael Niedermayer
2cffdcbdd7 avformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix probing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-29 00:38:51 +01:00
Michael Niedermayer
1c13e1ef36 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>
 2014-03-28 23:54:51 +01:00
Michael Niedermayer
075d6c066b avformat: add image2 brender pix demuxer 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-28 23:54:51 +01:00
Michael Niedermayer
13bcb4de33 avformat: add image2 alias pix demuxer 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-28 23:54:51 +01:00
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