generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
54,551 Commits 24 Branches 241 Tags
Commit Graph

24663 Commits

Author SHA1 Message Date
Michael Niedermayer
e1f98f2231 Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad' 
* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
  qdm2: formatting cosmetics

Conflicts:
	libavcodec/qdm2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 05:10:06 +02:00
Michael Niedermayer
d28a8ad8f3 Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14' 
* commit 'f054e309c58894450a5d18cce9799ef58aab9f14':
  qdm2: use init_static_data
  westwood_vqa: do not free extradata on error in read_header

Conflicts:
	libavformat/westwood_vqa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 05:02:52 +02:00
Michael Niedermayer
b5a87dc193 Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0' 
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
	libavcodec/vqavideo.c

See: b226af39107f09cd650875388250f4968eea54db

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 04:53:52 +02:00
Paul B Mahol
099e57bc38 zmbvenc: remove unused AVFrame from encoder private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 23:50:54 +00:00
Paul B Mahol
3bec6a44ea zmbvenc: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 23:45:17 +00:00
Paul B Mahol
ec4e042f33 gif: remove unused AVFrame from encoder private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 23:06:06 +00:00
Paul B Mahol
bd03f99d05 gif: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 22:57:17 +00:00
Luca Barbato
76efedeadb qdm2: formatting cosmetics 
Apply the usual style plus drop few unnecessary return at the end
of void functions.
 2013-07-07 22:06:28 +02:00
Luca Barbato
f054e309c5 qdm2: use init_static_data 2013-07-07 22:06:20 +02:00
Luca Barbato
c4abc9098c vqavideo: check the version 
Prevent out of buffer write.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-07 22:04:05 +02:00
Ronald S. Bultje
46d208e1e0 vp8: Wait for prev_frame to parse segment_map before reading it 
This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-07 13:30:29 +03:00
Paul B Mahol
19436308b4 dxa: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-06 16:33:59 +00:00
Michael Niedermayer
2adf8a9c09 Merge commit '4e7f0b082d8c4b360312216b9241bec65ff63b35' 
* commit '4e7f0b082d8c4b360312216b9241bec65ff63b35':
  kmvc: Clip pixel position to valid range

The added clip should make no difference, there are already checks for
the index.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 11:17:53 +02:00
Michael Niedermayer
1aeddc3cbf Merge commit '8f689770548c86151071ef976cf9b6998ba21c2a' 
* commit '8f689770548c86151071ef976cf9b6998ba21c2a':
  kmvc: use fixed sized arrays in the context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 10:54:39 +02:00
Michael Niedermayer
104dfaadaa dct_unquantize_h263_intra_c: fix assert condition 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 01:50:59 +02:00
Michael Niedermayer
707b2135fd libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE 
should fix ticket2755

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 01:50:59 +02:00
Michael Niedermayer
abce6dfd9e avcodec/x86/vp3dsp_init: move mmx functions under HAVE_MMX_INLINE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 01:50:59 +02:00
Luca Barbato
4e7f0b082d kmvc: Clip pixel position to valid range 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-06 14:12:45 +02:00
Luca Barbato
8f68977054 kmvc: use fixed sized arrays in the context 
Avoid some boilerplate code to dynamically allocate and then free the
buffers.
 2013-07-06 14:12:42 +02:00
Paul B Mahol
d64f3b72e0 replace some deprecated defines 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-06 05:43:24 +00:00
Michael Niedermayer
66537c7efd avcodec/x86/cabac: Disable get_cabac_bypass_x86() on broken llvm/clang 
This should fix fate on these platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-06 16:24:27 +02:00
Michael Niedermayer
32de28053d avcodec/x86/cabac: factorize broken llvm/clang check out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-06 16:24:27 +02:00
Michael Niedermayer
98277fd1a0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  bitstream_filter: K&R formatting cosmetics

Conflicts:
	libavcodec/bitstream_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-06 12:08:43 +02:00
Nigel Touati-Evans
ef8cc06d6e avformat/avidec: Fix incorrect detection of badly interleaved avi 
The method guess_ni_flag needs to divide timestamps in the index
by sample_size if it is set in order to compare different streams correctly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 22:07:48 +02:00
Paul B Mahol
6516a25f04 ADPCM IMA WAV 2, 3 and 5 bits decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-05 18:10:27 +00:00
Luca Barbato
4972e5a186 bitstream_filter: K&R formatting cosmetics 2013-07-05 19:38:24 +02:00
Paul B Mahol
48f2750de8 get_bits: add get_bits_le() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-05 16:51:08 +00:00
Peter Große
c6c2231227 libavcodec: use 64bit counter in deprecated audio encoder API to prevent problems regarding negative dts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 13:40:13 +02:00
Michael Niedermayer
9f89bebb7b Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320' 
* commit '6a10142faa1cca8ba2bfe51b970754f62d60f320':
  indeo: reject negative array indexes

Conflicts:
	libavcodec/ivi_common.c

See: 93927eb334dce961603645dd4ed9772bb2400cc4, a93c7ca6ef625188c9ec088c2e75f731b78c9923

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 12:26:25 +02:00
Michael Niedermayer
7d3b55c6a4 Merge commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911' 
* commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911':
  indeo: Cosmetic formatting

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 12:08:22 +02:00
Michael Niedermayer
9b10440dcd Merge commit '62256010e9bc8879e2bf7f3b94af8ff85e239082' 
* commit '62256010e9bc8879e2bf7f3b94af8ff85e239082':
  indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks

Conflicts:
	libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 12:02:53 +02:00
Michael Niedermayer
0e2056056f Merge commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912' 
* commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912':
  indeo: Refactor ff_ivi_dec_huff_desc

Conflicts:
	libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 11:50:46 +02:00
Michael Niedermayer
cced6f4d58 Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb' 
* commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb':
  indeo: use a typedef for the mc function pointer
  cabac: x86 version of get_cabac_bypass
  aic: use chroma scan tables while decoding luma component in progressive mode

Conflicts:
	libavcodec/aic.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 11:41:30 +02:00
Stefano Sabatini
0f85c96091 lavc/avcodec.h: document bitstream filter API 2013-07-05 11:03:56 +02:00
Stefano Sabatini
41fe750f4b lavc/bitstream_filter: do not crash in case the argument of av_bitstream_filter_close() is NULL 2013-07-05 00:58:03 +02:00
Michael Niedermayer
cb678cc2cf avcodec/svq1enc: fix frame rotation code 
Fixes Ticket2747

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-04 22:22:04 +02:00
Paul B Mahol
d1c96b28d7 libstagefright: port to refcounted frames 
Untested.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-04 20:17:38 +00:00
Paul B Mahol
dda8afc391 libstagefright: unbreak compilation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-04 20:07:12 +00:00
Sean McGovern
bf18abb2eb Rename "AVClass class" as "AVClass component_class" for external codecs. 
The aix header math.h defines "extern int class()" for C.
This fixes compilation on aix with external libraries enabled.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-07-04 18:02:17 +02:00
Carl Eugen Hoyos
f32b8130f4 Fix opacity and increase colour dynamics of initial vmd palette. 2013-07-04 18:01:08 +02:00
Luca Barbato
6a10142faa indeo: reject negative array indexes 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-04 16:06:11 +02:00
Luca Barbato
6dfacd7ab1 indeo: Cosmetic formatting 
Trim some overly long lines.
 2013-07-04 16:06:10 +02:00
Luca Barbato
62256010e9 indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks 
Spin large and mostly self contained blocks into stand alone
functions.
 2013-07-04 16:06:10 +02:00
Luca Barbato
f6f36ca8ca indeo: Refactor ff_ivi_dec_huff_desc 
Spare an indentation level.
 2013-07-04 16:06:10 +02:00
Luca Barbato
e6d8acf6a8 indeo: use a typedef for the mc function pointer 2013-07-04 16:06:10 +02:00
Jason Garrett-Glaser
d222f6e39e cabac: x86 version of get_cabac_bypass 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-07-04 16:06:10 +02:00
Michael Niedermayer
6d05039c7e avcodec/sonic: Fix usage of init_get_bits() and use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-04 13:40:08 +02:00
Michael Niedermayer
8c707a129a avcodec/svq1dec: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-04 13:40:08 +02:00
Michael Niedermayer
df6acc81a8 avcodec/ra288: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-04 13:40:08 +02:00
Kostya Shishkov
410066986f aic: use chroma scan tables while decoding luma component in progressive mode 
For some unclear reason Apple decided to use the same scan tables for luma and
chroma in the progressive mode while using different ones for luma in the
interlaced mode.
 2013-07-04 12:09:45 +02:00