summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avfilter/buffersrc: Use correct, matching deallocation functionMichael Niedermayer2015-04-201-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09'Michael Niedermayer2015-04-201-0/+1
|\ | | | | | | | | | | | | * commit '617814b4a717b38add5ccb8dd200dbb655f98f09': buffersrc: Fix resource leak on error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * buffersrc: Fix resource leak on errorFederico Tomassetti2015-04-191-0/+1
| | | | | | | | | | | | Bug-Id: CID 1267902 CC: libav-stable@libav.org Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'Michael Niedermayer2015-04-201-2/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '336d2f0979b43a39bd11a047d798b7990d8b07c6': avplay: Free frame and graph when memory allocation fails Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avplay: Free frame and graph when memory allocation failsFederico Tomassetti2015-04-191-2/+8
| | | | | | | | | | Bug-Id: CID 1291564 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'eb31256f12bf0c85aded1612551ce9230356879e'Michael Niedermayer2015-04-201-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'eb31256f12bf0c85aded1612551ce9230356879e': g2meet: Support G2M5 codec variant Conflicts: libavcodec/version.h See: 4ba5420e4d3699b89c9f7f15928cd486f88e9562 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: Support G2M5 codec variantEric Zimmerman2015-04-193-3/+4
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'Michael Niedermayer2015-04-200-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08': filtfmts: Avoid null pointer dereference Conflicts: libavfilter/filtfmts.c See: 24326930d87dd7e851c1cc383bc0682d746ffaf8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * filtfmts: Avoid null pointer dereferenceHimangi Saraogi2015-04-191-2/+13
| |
* | Merge commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354'Michael Niedermayer2015-04-200-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354': avutil: remove pointless bmi1 define See: a40cee03a3be131729e0c06e4825d14ac2076b03 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: remove pointless bmi1 defineJames Almer2015-04-191-3/+2
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e'Michael Niedermayer2015-04-200-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e': aacdec: consistently use avctx for logging in decode_eld_specific_config See: 5b75689b987e4c4dd4f34d5c8be389547e9cc701 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: consistently use avctx for logging in decode_eld_specific_configAndreas Cadhalpun2015-04-191-1/+1
| | | | | | | | | | | | ac may be NULL and then accessing ac->avctx results in a segmentation fault. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | Merge commit '3d71b1f8f09fccea7158e868fb9bd81b81205449'Michael Niedermayer2015-04-201-7/+5
|\ \ | |/ | | | | | | | | | | * commit '3d71b1f8f09fccea7158e868fb9bd81b81205449': mpegvideo_enc: Simplify picture allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo_enc: Simplify picture allocationVittorio Giovara2015-04-191-7/+5
| |
* | Merge commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0'Michael Niedermayer2015-04-200-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0': motion_est: Fix warning from zero_cmp() assignment See: ea41e6d6373063c3a2a9bf48ce8e1c2e6340b694 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * motion_est: Fix warning from zero_cmp() assignmentVittorio Giovara2015-04-191-1/+1
| | | | | | | | | | | | | | | | warning: incompatible pointer types assigning to 'me_cmp_func' (aka 'int (*)(struct MpegEncContext *, uint8_t *, uint8_t *, ptrdiff_t, int)') from 'int (MpegEncContext *, uint8_t *, uint8_t *, int, int)' [-Wincompatible-pointer-types]
* | Merge commit '4d593896aaa81356def8993e8c52294bd8bb2797'Michael Niedermayer2015-04-200-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '4d593896aaa81356def8993e8c52294bd8bb2797': vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr() Conflicts: libavcodec/vc1_pred.c See: 6c5bd7d785ffb796b8cfbae677ab54755b26a22b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()Vittorio Giovara2015-04-191-5/+3
| | | | | | | | Fix a rather lengthy initialization warning from clang.
* | Merge commit '9286de045968ad456d4e752651eec22de5e89060'Michael Niedermayer2015-04-201-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '9286de045968ad456d4e752651eec22de5e89060': mov: Double-check that alias path is not an absolute path Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Double-check that alias path is not an absolute pathVittorio Giovara2015-04-191-1/+1
| | | | | | | | | | | | | | 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).
* | Merge commit '376589e5dd72aa2dd42500f456fca303fcdcad85'Michael Niedermayer2015-04-201-1/+3
|\ \ | |/ | | | | | | | | | | * commit '376589e5dd72aa2dd42500f456fca303fcdcad85': mov: Read alternate absolute path in dref alis Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Read alternate absolute path in dref alisVittorio Giovara2015-04-191-1/+3
| | | | | | | | | | | | | | 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.
* | Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'Michael Niedermayer2015-04-2017-1/+9029
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '22526c1f557a72b3285d295bd8b30c40eb65d437': Canopus HQ/HQA decoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Canopus HQ/HQA decoderVittorio Giovara2015-04-1917-1/+9029
| | | | | | | | | | | | Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'e6fb844f7b736e72da364032d251283bce9e63ad'Michael Niedermayer2015-04-205-12/+111
|\ \ | |/ | | | | | | | | | | * commit 'e6fb844f7b736e72da364032d251283bce9e63ad': Implement shared parsing of INFO tag in Canopus family Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Implement shared parsing of INFO tag in Canopus familyVittorio Giovara2015-04-195-12/+111
| | | | | | | | | | Add some bounds checking to CLLC; reduce HQX variable scoping, add an error message.
* | Merge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c'Michael Niedermayer2015-04-204-8/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c': fate: Prefix cllc tests with canopus Conflicts: tests/fate/lossless-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Prefix cllc tests with canopusVittorio Giovara2015-04-194-8/+8
| | | | | | | | They belong to the same family of codecs.
* | Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'Michael Niedermayer2015-04-202-69/+66
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '5b5338f6d1272526d2634501555cbaff4cdfb87b': hqx: Implement slice-threaded decoding Conflicts: libavcodec/hqx.c libavcodec/hqx.h See: eff72a6c7375587a3280ddf59e6e26a4907823b7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hqx: Implement slice-threaded decodingVittorio Giovara2015-04-192-60/+79
| | | | | | | | | | | | Inspired by a patch from Ferdinand Oeinck <ferdo@demon.nl>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '453642f8afe9f979fcc813a246b1ec656ec36a93'Michael Niedermayer2015-04-202-69/+67
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '453642f8afe9f979fcc813a246b1ec656ec36a93': hqx: Store shareable data in main decoder context Conflicts: libavcodec/hqx.c libavcodec/hqx.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hqx: Store shareable data in main decoder contextVittorio Giovara2015-04-192-62/+65
| | | | | | | | In preparation for multithreaded decoding.
* | Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9'Michael Niedermayer2015-04-205-137/+207
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'ea031b75fb50c59196ccb654c9d143fb75365da9': hqx: Move DSP related code to a separate file Conflicts: libavcodec/hqx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hqx: Move DSP related code to a separate fileVittorio Giovara2015-04-195-137/+207
| |
* | Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'Michael Niedermayer2015-04-201-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905': hqx: Merge invalid format check within switch block Conflicts: libavcodec/hqx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hqx: Merge invalid format check within switch blockVittorio Giovara2015-04-191-2/+1
| |
* | avcodec/internal: Fix ff_dlog() define like av_dlog()Michael Niedermayer2015-04-201-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: fix build with DEBUG/TRACEMichael Niedermayer2015-04-202-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer2015-04-2075-436/+460
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara2015-04-1976-441/+463
| |
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-2039-360/+360
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-1944-365/+366
| | | | | | | | This applies to every library where performance is not critical.
* | Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'Michael Niedermayer2015-04-206-4/+24
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * log: Introduce a more verbose debug levelVittorio Giovara2015-04-196-4/+24
| | | | | | | | And deprecate av_dlog macro.
* | ffmpeg: Fix null pointer dereference in do_video_out()Michael Niedermayer2015-04-191-0/+3
| | | | | | | | | | | | Fixes: CID1295087 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: remove now duplicate doctype checkMichael Niedermayer2015-04-191-2/+1
| | | | | | | | | | | | See: b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e See: d9fe6b926cd619c311e45e0ae352cf09713c482c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: Use check_marker()Michael Niedermayer2015-04-191-15/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: Fix 2 typosMichael Niedermayer2015-04-191-1/+1
| | | | | | | | | | Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: Return an error in case of prematurely ending dataMichael Niedermayer2015-04-191-0/+8
| | | | | | | | | | | | Fixes Ticket 4039 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud