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

30618 Commits

Author SHA1 Message Date
Michael Niedermayer
148506c965 Merge commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0' 
* commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0':
  hevc: Spin the mv_mpv_mode calls in a stand alone function

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 01:32:55 +01:00
Michael Niedermayer
a82f3de053 Merge commit '312daa15891dc7abb77a404fe927d5ee35c52a71' 
* commit '312daa15891dc7abb77a404fe927d5ee35c52a71':
  vp9: Use the correct upper bound for seg_id

Conflicts:
	libavcodec/vp9.h
	libavcodec/vp9block.c

Not merged, the value was correct before as far as i can see

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 23:37:04 +01:00
Luca Barbato
cd975d5658 hevc: Spin the mv_mpv_mode calls in a stand alone function 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-11-21 23:17:37 +01:00
Michael Niedermayer
ac967ad872 Merge commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3' 
* commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3':
  dvdsubdec: Do not leak on failure path

Conflicts:
	libavcodec/dvdsubdec.c

See: 7fa9f7ef1c2f0cee81ec6ea6a4ff10af4c4fc62c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:36:01 +01:00
Michael Niedermayer
018ce90284 avcodec/libspeexdec: more verbose error message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 20:08:56 +01:00
Michael Niedermayer
d96d8e121f avcodec/libspeexdec: support zygoaudio 
Fixes Ticket1873

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 20:08:05 +01:00
Michael Niedermayer
2ae2c60554 avcodec/vp6: Use av_freep(), avoid leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 18:03:27 +01:00
Benoit Fouet
33acebd3cc avcodec/pngdec: add APNG support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 17:13:56 +01:00
Vittorio Giovara
1f80742f49 qdm2: avoid integer overflow 
CC: libav-stable@libav.org
Bug-Id: CID 700555
 2014-11-21 12:37:50 +00:00
Luca Barbato
312daa1589 vp9: Use the correct upper bound for seg_id 
And use a macro to make apparent why the value.

Bug-Id: CID 1108595
 2014-11-21 12:37:05 +00:00
Luca Barbato
d466d82faa dvdsubdec: Do not leak on failure path 
CC: libav-stable@libav.org
Bug-Id: CID 1198262
 2014-11-21 12:36:19 +00:00
Vittorio Giovara
a42d5c861f libtwolame: prevent a NULL pointer dereference 
CC: libav-stable@libav.org
Bug-Id: CID 1250330 / CID 1250335
 2014-11-21 12:27:07 +00:00
Martin Storsjö
aa8b39d999 lavc: Move the libtwolame encoder registration to the list for external libraries 
This makes sure the default behaviour of using the internal encoder
stays the same regardless if libtwolame is enabled or not (as for
any external library).

This fixes fate-lavf-mpg if libav is built with libtwolame enabled.

CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-11-21 12:27:07 +00:00
Lukasz Marek
7d75a399a4 lavc/options: fix rc_eq leak 
rc_eq is an option, so it is copied by av_opt_copy(dest, src); above.
 2014-11-21 01:19:53 +01:00
Michael Niedermayer
21ded9ce67 avcodec/imc: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 22:46:44 +01:00
Michael Niedermayer
b054054c9b avcodec/dcadec: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 22:46:08 +01:00
Michael Niedermayer
9018bd1197 avcodec/atrac1: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 22:30:48 +01:00
Michael Niedermayer
8bce5c8e74 avcodec/ac3dec: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 22:30:48 +01:00
Michael Niedermayer
bab11fe7bf avcodec/mpeg12dec: forward error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 16:31:27 +01:00
Michael Niedermayer
1852b2a0f4 avcodec/mpeg12dec: Use more specific error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 16:29:42 +01:00
Michael Niedermayer
0f8908aa1b avcodec/mpeg12dec: do not fail on invalid frame_rate_index 
Fixes Ticket4073

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 15:09:42 +01:00
Michael Niedermayer
88b4c1a731 avcodec/mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 15:09:26 +01:00
Michael Niedermayer
4ffec6d933 avcodec/twinvq: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 13:44:40 +01:00
Michael Niedermayer
b9792afad1 avcodec/tta: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 13:44:39 +01:00
Michael Niedermayer
beec818d99 avcodec/truemotion2: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 13:44:30 +01:00
Peter Hall
ea79dfbad3 avcodec/libvorbisenc: Give CODEC_CAP_SMALL_LAST_FRAME to libvorbis encoder. 
The libvorbis encoder already supports a small last frame, but the layer
above doesn't know that because we didn't register the small last frame
capability.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 20:23:08 +01:00
Vadim Kalinsky
d1d3904273 avcodec/options: Set AVCodecContext->codec upon initialization. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 18:46:30 +01:00
Michael Niedermayer
06d2742899 avcodec/nellymoser: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 12:11:57 +01:00
Michael Niedermayer
bb5e148299 libavcodec/tiffenc: Use av_freep() avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 11:33:58 +01:00
Michael Niedermayer
98fbf8ef67 libavcodec/libxavs: Use av_freep() avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 11:33:41 +01:00
Michael Niedermayer
ade140eb73 libavcodec/libx264: Use av_freep() avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 11:33:00 +01:00
Michael Niedermayer
4243415741 avcodec/mjpegdec: Support some subsampled GBR variants 
Fixes Ticket4045

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 05:10:21 +01:00
Michael Niedermayer
9bb6e1175f avcodec/internal: Add () to argument of FF_SIGNBIT() to ensure correct order or operations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 03:42:40 +01:00
Michael Niedermayer
cdbebae444 Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa' 
* commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa':
  lavc: fix bitshifts amount bigger than the type

Conflicts:
	libavcodec/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 03:16:38 +01:00
Michael Niedermayer
8426edef4c Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b' 
* commit '771656bd85416cd6308b11aed6f2c69a8db9c21b':
  libvpxenc: clean memory on error

Conflicts:
	libavcodec/libvpxenc.c

See: 104b1d9e103f90485e894b20dd5bb3f1964fe5f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-18 03:08:20 +01:00
Vittorio Giovara
85dc006b1a lavc: fix bitshifts amount bigger than the type 
CC: libav-stable@libav.org
Bug-Id: CID 1194387 / CID 1194389 / CID 1194393 / CID 1206638
 2014-11-18 00:39:23 +01:00
Vittorio Giovara
771656bd85 libvpxenc: clean memory on error 
CC: libav-stable@libav.org
Bug-Id: CID 733795
 2014-11-18 00:38:56 +01:00
Michael Niedermayer
894d10332c avcodec/lcldec: support rgb24 with width%4 != 0 
Fixes Ticket1216

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 21:06:31 +01:00
Michael Niedermayer
91a9ae5b6b Merge commit 'eac3ac1fe0774b65316852616b2672702dbc3f31' 
* commit 'eac3ac1fe0774b65316852616b2672702dbc3f31':
  hevc: eliminate an unneeded intermediate variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 12:13:09 +01:00
Michael Niedermayer
0d5af820f7 Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc' 
* commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc':
  hevc: reduce variable scope

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 12:07:49 +01:00
Michael Niedermayer
c23d7de22e Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8' 
* commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8':
  hevc: further reduce code duplication in hls_prediction_unit()

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 12:01:47 +01:00
Michael Niedermayer
e078549421 Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139' 
* commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139':
  hevc: reduce code duplication in hls_prediction_unit()

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 11:54:41 +01:00
Michael Niedermayer
30156eab6d Merge commit 'de1f8ead8993512925a3ee6c7491473414419e55' 
* commit 'de1f8ead8993512925a3ee6c7491473414419e55':
  hevcdsp_template: templatize transquant_bypass

Conflicts:
	libavcodec/hevcdsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 11:41:35 +01:00
Michael Niedermayer
c192be1968 Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e' 
* commit '16c01fb4347312b6d29a6498dad627665b96a20e':
  hevc: remove an unused function parameter

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 11:30:41 +01:00
Michael Niedermayer
f1b20930f2 Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e' 
* commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e':
  hevc: do not store rqt_root_cbf in the context

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 11:20:32 +01:00
Michael Niedermayer
7cbe1e0447 Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57' 
* commit '920bca3e2332dced9c78bd14cfc2ff138188bd57':
  hevc: do not store pcm_flag in the context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-17 11:06:13 +01:00
Anton Khirnov
eac3ac1fe0 hevc: eliminate an unneeded intermediate variable 2014-11-17 09:26:45 +01:00
Anton Khirnov
eb335f3c5c hevc: reduce variable scope 
Also, collapse the array into a scalar, since only one value is needed
at a time.
 2014-11-17 09:26:45 +01:00
Anton Khirnov
8b573ddda7 hevc: remove superfluous assignments and checks 2014-11-17 09:26:45 +01:00
Anton Khirnov
84c0ece5fd hevc: further reduce code duplication in hls_prediction_unit() 2014-11-17 09:25:15 +01:00