generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
71,549 Commits 24 Branches 241 Tags 173 MiB
127f7aa401
Commit Graph

71549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
127f7aa401 Merge commit '4d593896aaa81356def8993e8c52294bd8bb2797' 
* commit '4d593896aaa81356def8993e8c52294bd8bb2797':
  vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()

Conflicts:
	libavcodec/vc1_pred.c

See: 6c5bd7d785
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 11:17:36 +02:00
Michael Niedermayer
4d50d53a6d Merge commit '9286de045968ad456d4e752651eec22de5e89060' 
* commit '9286de045968ad456d4e752651eec22de5e89060':
  mov: Double-check that alias path is not an absolute path

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 11:03:32 +02:00
Michael Niedermayer
82d9c4e578 Merge commit '376589e5dd72aa2dd42500f456fca303fcdcad85' 
* commit '376589e5dd72aa2dd42500f456fca303fcdcad85':
  mov: Read alternate absolute path in dref alis

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:51:40 +02:00
Michael Niedermayer
5a284d076f Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437' 
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
  Canopus HQ/HQA decoder

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:28:13 +02:00
Michael Niedermayer
fcca7671e2 Merge commit 'e6fb844f7b736e72da364032d251283bce9e63ad' 
* commit 'e6fb844f7b736e72da364032d251283bce9e63ad':
  Implement shared parsing of INFO tag in Canopus family

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:19:46 +02:00
Michael Niedermayer
f1db984288 Merge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c' 
* commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c':
  fate: Prefix cllc tests with canopus

Conflicts:
	tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:19:03 +02:00
Michael Niedermayer
1fa7d0902c Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b' 
* commit '5b5338f6d1272526d2634501555cbaff4cdfb87b':
  hqx: Implement slice-threaded decoding

Conflicts:
	libavcodec/hqx.c
	libavcodec/hqx.h

See: eff72a6c73
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:11:48 +02:00
Michael Niedermayer
55b866f618 Merge commit '453642f8afe9f979fcc813a246b1ec656ec36a93' 
* commit '453642f8afe9f979fcc813a246b1ec656ec36a93':
  hqx: Store shareable data in main decoder context

Conflicts:
	libavcodec/hqx.c
	libavcodec/hqx.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:57:06 +02:00
Michael Niedermayer
d8b4e9adbb Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9' 
* commit 'ea031b75fb50c59196ccb654c9d143fb75365da9':
  hqx: Move DSP related code to a separate file

Conflicts:
	libavcodec/hqx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:33:06 +02:00
Michael Niedermayer
73e6af9d7b Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905' 
* commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905':
  hqx: Merge invalid format check within switch block

Conflicts:
	libavcodec/hqx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:29:58 +02:00
Michael Niedermayer
dbd94b771f avcodec/internal: Fix ff_dlog() define like av_dlog() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:27:08 +02:00
Michael Niedermayer
0a582aeee4 avcodec: fix build with DEBUG/TRACE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:11:23 +02:00
Michael Niedermayer
8f7b022c8c Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25' 
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25':
  lavc: Replace av_dlog and tprintf with internal macros

Conflicts:
	libavcodec/aacdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/bitstream.c
	libavcodec/dcadec.c
	libavcodec/dnxhddec.c
	libavcodec/dvbsubdec.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/get_bits.h
	libavcodec/gifdec.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c
	libavcodec/imc.c
	libavcodec/interplayvideo.c
	libavcodec/jpeglsdec.c
	libavcodec/libopencore-amr.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_parser.c
	libavcodec/pngdec.c
	libavcodec/ratecontrol.c
	libavcodec/rv10.c
	libavcodec/svq1dec.c
	libavcodec/vqavideo.c
	libavcodec/wmadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:10:10 +02:00
Michael Niedermayer
40d552dae6 Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 03:19:47 +02:00
Michael Niedermayer
8e8219e0f0 Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e' 
* commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e':
  log: Introduce a more verbose debug level

Conflicts:
	doc/APIchanges
	doc/fftools-common-opts.texi
	libavutil/log.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 02:48:19 +02:00
Vittorio Giovara
4d593896aa vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr() 
Fix a rather lengthy initialization warning from clang.
 2015-04-19 23:17:56 +01:00
Vittorio Giovara
9286de0459 mov: Double-check that alias path is not an absolute path 
nlvl_to and nlvl_from can be set to 1 if both alias and target files
are in the same directory, so actually check the first character of the
string. We can do this because MacOS filepaths (alis type 2) are always
converted to UNIX filepaths (alis type 18).
 2015-04-19 22:50:24 +01:00
Vittorio Giovara
376589e5dd mov: Read alternate absolute path in dref alis 
Absolute paths can be stored in alis type 2 and 18 according to my research:
the first is the canonical MacOS filepath, with path level separated by
colons, and the volume name within the filepath, while the second should be the
absolute filesystem path from the mount point.
 2015-04-19 22:48:14 +01:00
Michael Niedermayer
93db2708d3 ffmpeg: Fix null pointer dereference in do_video_out() 
Fixes: CID1295087

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-19 23:44:19 +02:00
Vittorio Giovara
22526c1f55 Canopus HQ/HQA decoder 
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 22:37:23 +01:00
Vittorio Giovara
e6fb844f7b Implement shared parsing of INFO tag in Canopus family 
Add some bounds checking to CLLC; reduce HQX variable scoping,
add an error message.
 2015-04-19 22:37:02 +01:00
Vittorio Giovara
fcda30f2dc fate: Prefix cllc tests with canopus 
They belong to the same family of codecs.
 2015-04-19 22:36:50 +01:00
Vittorio Giovara
5b5338f6d1 hqx: Implement slice-threaded decoding 
Inspired by a patch from Ferdinand Oeinck <ferdo@demon.nl>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 22:36:48 +01:00
Vittorio Giovara
453642f8af hqx: Store shareable data in main decoder context 
In preparation for multithreaded decoding.
 2015-04-19 22:36:41 +01:00
Michael Niedermayer
0cab0931dc avformat/matroskadec: remove now duplicate doctype check 
See: b8d7f3186e
See: d9fe6b926c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-19 16:47:12 +02:00
Michael Niedermayer
9a0f60a0f8 avcodec/mpeg4videodec: Use check_marker() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-19 15:34:43 +02:00
Michael Niedermayer
22c0585a00 avformat/http: Fix 2 typos 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-19 14:26:40 +02:00
Vittorio Giovara
ea031b75fb hqx: Move DSP related code to a separate file 2015-04-19 12:41:59 +01:00
Vittorio Giovara
17aa81d947 hqx: Merge invalid format check within switch block 2015-04-19 12:41:59 +01:00
Vittorio Giovara
6a85dfc830 lavc: Replace av_dlog and tprintf with internal macros 2015-04-19 12:41:59 +01:00
Vittorio Giovara
1a3eb042c7 Replace av_dlog with normal av_log at trace level 
This applies to every library where performance is not critical.
 2015-04-19 12:41:59 +01:00
Vittorio Giovara
c253340ae6 log: Introduce a more verbose debug level 
And deprecate av_dlog macro.
 2015-04-19 12:41:59 +01:00
Michael Niedermayer
3668701f96 avformat/http: Return an error in case of prematurely ending data 
Fixes Ticket 4039

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-19 13:01:48 +02:00
James Almer
a40cee03a3 avutil: remove pointless bmi1 define 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-18 22:15:25 -03:00
Lou Logan
d1a8922098 cmdutils: indent protocols listing 
For readability.

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-19 02:05:22 +02:00
Andreas Cadhalpun
faf9fe2c22 alsdec: validate time diff index 
If begin is smaller than t, the subtraction 'begin -= t' wraps around,
because begin is unsigned. The same applies for end < t.

This causes segmentation faults.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-19 00:49:42 +02:00
James Almer
5cd2169344 wavpackenc: use put_sbits() 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-18 18:07:54 -03:00
Thomas Guillem
b8d7f3186e matroskadec: fix crash when parsing invalid mkv 
CC: libav-stable@libav.org

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-04-18 16:49:25 +02:00
Paul B Mahol
df7c2b2f1b avformat/riff: support G729A 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-04-17 19:01:58 +00:00
Paul B Mahol
daf73d5d17 avcodec/g729dec: support decoding packets with multiple frames 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-04-17 19:01:58 +00:00
Michael Niedermayer
f98cad8759 Merge commit 'b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e' 
* commit 'b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e':
  matroskadec: fix crash when parsing invalid mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-18 21:13:25 +02:00
Andreas Cadhalpun
4c2b88678b alsdec: limit avctx->bits_per_raw_sample to 32 
avctx->bits_per_raw_sample is used in get_sbits_long, which only
supports up to 32 bits.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-18 21:00:25 +02:00
Michael Niedermayer
7e104647a3 avcodec/alsdec: Use av_mallocz_array() for chan_data to ensure the arrays never contain random data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-18 20:50:23 +02:00
Andreas Cadhalpun
ef16501aeb alsdec: ensure channel reordering is reversible 
If the same idx is used for more than one i, at least one entry in
sconf->chan_pos remains uninitialized.

This can cause segmentation faults.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-18 19:26:17 +02:00
James Almer
d8c52f5d04 proresenc_anatoliy: use put_sbits() 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-18 14:15:57 -03:00
James Almer
778bac2788 adpcm: use av_clip_intp2() 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-18 14:15:07 -03:00
James Almer
979b77eec5 dca_xll: use av_clip_intp2() 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-18 14:14:24 -03:00
James Almer
b5564e041b dcaenc: use put_sbits() 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-18 14:14:11 -03:00
James Almer
6863249b34 aaccoder: use put_sbits() 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-18 14:13:59 -03:00
Mariusz Szczepańczyk
e623e8cbb0 lavf: add documentation on directory listing API 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-18 17:54:04 +02:00