ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-25 07:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,520 Commits 37 Branches 398 Tags 539 MiB
037adf589a
Commit Graph

19 Commits

Author SHA1 Message Date
Michael Niedermayer
2becf21d9f Merge commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca' 
* commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca':
  tak: decode directly to the user-provided AVFrame
  smackaud: decode directly to the user-provided AVFrame
  sipr: decode directly to the user-provided AVFrame
  shorten: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/shorten.c
	libavcodec/takdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 12:35:37 +01:00
Justin Ruggles
4a2b26fc1b tak: decode directly to the user-provided AVFrame 2013-02-12 12:22:39 -05:00
Michael Niedermayer
6b2e65078c Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9' 
* commit '218aefce4472dc02ee3f12830a9a894bf7916da9':
  dsputil: Move LOCAL_ALIGNED macros to libavutil

Conflicts:
	libavcodec/dvdec.c
	libavcodec/imc.c
	libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-09 14:33:57 +01:00
Diego Biurrun
218aefce44 dsputil: Move LOCAL_ALIGNED macros to libavutil 2013-02-08 23:13:37 +01:00
Paul B Mahol
9efceaf1f7 takdec: switch to init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-28 22:47:30 +00:00
Paul B Mahol
4c7515286b takdec: silence/fix warning for undefined behavior 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-10 12:06:30 +00:00
Paul B Mahol
cef28b5602 tak: reduce difference with qatar 
Mostly cosmetics changes, but also makes
decoding little faster here.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-09 22:01:00 +00:00
Josh Allmann
b3deec3253 takdec: fix initialisation of LOCAL_ALIGNED array 
When LOCAL_ALIGNED uses manual alignment initialisation is not
possible.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-12-08 00:00:30 +01:00
Mans Rullgard
cd71af90a9 takdec: fix initialisation of LOCAL_ALIGNED array 
When LOCAL_ALIGNED uses manual alignment initialisation is not
possible.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-12-07 22:13:57 +00:00
Paul B Mahol
57231e4d5b tak: demuxer, parser, and decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-12-07 16:15:02 -05:00
Paul B Mahol
6777aa6387 lavc/takdec: s/get_b/get_bits_esc4 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-07 15:19:49 +00:00
Paul B Mahol
1c779854b5 lavc/takdec: simplify code 
Merge get_scale/get_shift into set_sample_rate_params().
Rename tak_set_bps to set_bps_params and remove 2nd argument.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-07 15:01:02 +00:00
Paul B Mahol
f8d68822c0 takdec: use samplefmt.h from libavutil 
Instead of having own code for calculating decoded buffer size
just use already provided functions from libavutil.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-07 01:11:55 +00:00
Paul B Mahol
4e4a95b18e takdec: remove get_code() and use get_sbits() directly 
As found by Justin, this is probably bug in reference decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-07 00:03:47 +00:00
Michael Niedermayer
874c5b02c4 Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793' 
* commit '594d4d5df3c70404168701dd5c90b7e6e5587793':
  lavc: add a wrapper for AVCodecContext.get_buffer().

Conflicts:
	libavcodec/4xm.c
	libavcodec/8svx.c
	libavcodec/bmv.c
	libavcodec/cljr.c
	libavcodec/cscd.c
	libavcodec/dnxhddec.c
	libavcodec/dpcm.c
	libavcodec/dpx.c
	libavcodec/eacmv.c
	libavcodec/eamad.c
	libavcodec/frwu.c
	libavcodec/g723_1.c
	libavcodec/gifdec.c
	libavcodec/idcinvideo.c
	libavcodec/iff.c
	libavcodec/indeo3.c
	libavcodec/internal.h
	libavcodec/interplayvideo.c
	libavcodec/kmvc.c
	libavcodec/mpc7.c
	libavcodec/mpegaudiodec.c
	libavcodec/pcx.c
	libavcodec/pngdec.c
	libavcodec/pnmdec.c
	libavcodec/rl2.c
	libavcodec/snow.c
	libavcodec/targa.c
	libavcodec/tscc.c
	libavcodec/txd.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/vb.c
	libavcodec/vmdav.c
	libavcodec/vp56.c
	libavcodec/vqavideo.c
	libavcodec/wavpack.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 15:18:12 +01:00
Paul B Mahol
0a8360c4f9 takdec: add .sample_fmts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-03 15:21:19 +00:00
Paul B Mahol
4dcf71aacc takdec: stop decoding in case of unknown bps 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-12 09:18:58 +00:00
Paul B Mahol
56519d7d14 takdec: s/bits_per_coded_sample/bits_per_raw_sample 
bits_per_coded_sample should be set from demuxer and
not from decoder.

Prior to this change value set from demuxer would get
overwritten in decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-12 09:07:31 +00:00
Paul B Mahol
d7a4739265 TAK demuxer, decoder and parser 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-08 09:06:25 +00:00