summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/atrac1: fix decoder: QMF delay compensation should be 39 samplesDaniil Cherednik2015-11-212-7/+14
| | | | | | This also adds a new fate test Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/utils: Fix indentationTimothy Gu2015-11-201-1/+1
|
* aacsbr: don't call sbr_dequant twice without intermediate read_sbr_dataAndreas Cadhalpun2015-11-202-0/+11
| | | | | | | | Doing that doesn't make sense, because the only purpose of sbr_dequant is to process the data from read_sbr_data. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* avformat/rsd: implement seekingPaul B Mahol2015-11-201-0/+7
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/ffmdec: Only return EAGAIN if a server is attachedMichael Niedermayer2015-11-201-2/+7
| | | | | | | This should fix a infinite loop Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffserver: Use AVOption API to access ffm demuxer instead of direct access ↵Michael Niedermayer2015-11-201-3/+3
| | | | | | | | | depending on ABI server_attached is newly added so the demuxer knows if there is an attached server that can update the write index. This is needed to fix a infinite loop Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ffmdec: Add cleaner API for ffserver to interface without depending ↵Michael Niedermayer2015-11-203-1/+17
| | | | | | | on internal ABI Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: fix -copy_prior_start 0 with -copyts and input -ssRodger Combs2015-11-201-8/+7
| | | | | | Also rearranged the relevant check to reduce code duplication Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/flvenc: Add aac_seq_header_detect and flvflagsMaksym Veremeyenko2015-11-201-0/+45
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: preserve profile for audio stream copyMaksym Veremeyenko2015-11-201-0/+1
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/assdec: allow ASS files starting with empty linesClément Bœsch2015-11-201-0/+3
| | | | See https://github.com/mpv-player/mpv/issues/2506
* avfilter/af_dynaudnorm: use M_PIGanesh Ajjanagadde2015-11-201-3/+1
| | | | | | | | | | The ad-hoc pi constant has a ludicrous number of digits that offer no value whatsoever. M_PI is more consistent and readable across the codebase. Reviewed-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* tests/tiny_ssim: replace #define by typedefGanesh Ajjanagadde2015-11-201-3/+2
| | | | | | | | | See e.g https://stackoverflow.com/questions/1666353/are-typedef-and-define-the-same-in-c for rationale. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avcodec/faanidct: replace #define by typedefGanesh Ajjanagadde2015-11-201-1/+1
| | | | | | | | See e.g https://stackoverflow.com/questions/1666353/are-typedef-and-define-the-same-in-c for rationale. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avcodec/resample2: replace #define by typedefGanesh Ajjanagadde2015-11-201-6/+6
| | | | | | | | See e.g https://stackoverflow.com/questions/1666353/are-typedef-and-define-the-same-in-c for rationale. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avcodec/lpc: replace #define by typedefGanesh Ajjanagadde2015-11-201-3/+3
| | | | | | | | See e.g https://stackoverflow.com/questions/1666353/are-typedef-and-define-the-same-in-c for rationale. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avcodec/ac3: replace #define by typedefGanesh Ajjanagadde2015-11-201-4/+4
| | | | | | | | See e.g https://stackoverflow.com/questions/1666353/are-typedef-and-define-the-same-in-c for rationale. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avcodec/h264, videotoolbox: do not return invalid frames on failurewm42015-11-202-1/+4
| | | | | | | | | | | | If videotoolbox_common_end_frame failed, then the AVFrame was returned to the API user with the dummy buffer (in AVFrame.buf[0]) still set, and the decode call indicating success. These "half-set" AVFrames with dummy buffer are a videotoolbox specific hack, because the decoder requires an allocated AVFrame for its internal logic. Videotoolbox on the other hand allocates its frame itself internally, and outputs it only on end_frame. At this point, the dummy buffer is replaced with the real frame (unless decoding fails).
* avcodec/aacsbr_fixed: Replace a noise_facs_q check by an av_assert0Michael Niedermayer2015-11-201-4/+1
| | | | | | | The replaced check should have become redundant Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/sbr: fix copy and paste errorMichael Niedermayer2015-11-201-1/+1
| | | | | Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* hqx: correct type and size check of info_offsetAndreas Cadhalpun2015-11-201-2/+2
| | | | | | | | | | It is used as size argument of ff_canopus_parse_info_tag, which uses it as size argument to bytestream2_init, which only supports sizes up to INT_MAX. Changing it's type to unsigned simplifies the check. Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* avformat: add VPK demuxerPaul B Mahol2015-11-196-2/+121
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/rsd: reindent after the last commitJames Almer2015-11-191-13/+13
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/rsd: GADP files are adpcm_thp_leJames Almer2015-11-191-9/+6
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit '1fc94724f1fd52944bb5ae571475c621da4b77a0'Derek Buitenhuis2015-11-191-2/+4
|\ | | | | | | | | | | | | * commit '1fc94724f1fd52944bb5ae571475c621da4b77a0': xtea: Clarify that the current API works in big endian mode Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * xtea: Clarify that the current API works in big endian modeMartin Storsjö2015-11-131-2/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7b2211bfc4b0c4568180a8db2478023c42d9ff51'Derek Buitenhuis2015-11-190-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | These are all no-op merges. * commit '7b2211bfc4b0c4568180a8db2478023c42d9ff51': dds: add missing newline to log messages dds: validate compressed source buffer size dds: validate source buffer size before copying Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * dds: add missing newline to log messagesAndreas Cadhalpun2015-11-121-2/+2
| | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| * dds: validate compressed source buffer sizeAndreas Cadhalpun2015-11-121-0/+9
| | | | | | | | | | | | | | A too small buffer will cause segfaults somewhere below decompress_texture_thread. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| * dds: validate source buffer size before copyingAndreas Cadhalpun2015-11-121-0/+6
| | | | | | | | | | | | If it is too small av_image_copy_plane segfaults. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | Merge commit 'b5f963bfec1f452c37eee900c7b11f065d10dd60'Derek Buitenhuis2015-11-191-1/+6
|\ \ | |/ | | | | | | | | | | * commit 'b5f963bfec1f452c37eee900c7b11f065d10dd60': mov: Drop dref when unable to parse Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mov: Drop dref when unable to parseVittorio Giovara2015-11-121-1/+6
| | | | | | | | | | | | | | Some entries might be either empty or contain types we do not parse (eg. 'url '). In both cases, if an 'alis' is not the first entry, external references are not loaded, so make sure that the array starts with an 'alis' dref.
* | Merge commit '303f931938c618668f7f83c646a1850bef84641e'Derek Buitenhuis2015-11-191-4/+2
|\ \ | |/ | | | | | | | | | | * commit '303f931938c618668f7f83c646a1850bef84641e': mov: Correctly store dref paths Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mov: Correctly store dref pathsVittorio Giovara2015-11-121-4/+2
| | | | | | | | | | | | | | | | | | | | Rather than reading the alternate absolute path version from dref type 18, make sure that 0s are considered as '/'. These values are sometimes present in the full path, and are mistakenly interpreted as line terminators othewise. With the correct handling of this dref type, parsing type 18 is not needed any more.
* | Merge commit 'e25cac50e05d29a15d7a52c01c394ba913c97aee'Derek Buitenhuis2015-11-192-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'e25cac50e05d29a15d7a52c01c394ba913c97aee': lavc: Add missing mem.h header to libxvid and screenpresso Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Add missing mem.h header to libxvid and screenpressoVittorio Giovara2015-11-122-0/+2
| |
* | Merge commit '73b03249133d6631520089798087cbd963eed9ca'Derek Buitenhuis2015-11-190-0/+0
|\ \ | |/ | | | | | | | | | | * commit '73b03249133d6631520089798087cbd963eed9ca': aiff: Support demuxing G.722 streams Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * aiff: Support demuxing G.722 streamsCarl Eugen Hoyos2015-11-122-0/+2
| |
* | avcodec/aacsbr: Replace a noise_facs_q check by an av_assert0Michael Niedermayer2015-11-191-4/+1
| | | | | | | | | | | | The replaced check should have become redundant Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/aacsbr_template: Check values read in read_sbr_noise()Michael Niedermayer2015-11-191-8/+28
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/aacsbr: Split pre dequantization noise factors tableMichael Niedermayer2015-11-194-25/+14
| | | | | | | | | | | | | | This allows removing a special case for the fixed point decoder and will make error checks simpler Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/pthread_slice: remove dummy_ret hackMichael Niedermayer2015-11-191-4/+6
| | | | | | | | | | | | | | This should avoid some tsan warnings Found-by: Chris Cunningham <chcunningham@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | mxfdec: check edit_rate also for physical_trackAndreas Cadhalpun2015-11-181-0/+10
| | | | | | | | | | | | | | | | Previously only the edit_rate of material_track was checked. If it's negative, it causes assertion failures in av_rescale_rnd. Reviewed-by: Tim Nicholson <nichot20-at-yahoo.com@ffmpeg.org> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avcodec/h264_slice: Clear top_borders on allocationMichael Niedermayer2015-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | In case of bitstream errors the deblock filter and slices can access uninitialized top_borders from previous slices which did not fill them as they stoped halfway due to error or where entirely missing. This also makes code using these tables deterministic in case of missing or damaged slices Found-by: Tyson Smith Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avutil/mem: Add av_fast_mallocz()Michael Niedermayer2015-11-184-1/+23
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c'Derek Buitenhuis2015-11-180-0/+0
|\ \ | |/ | | | | | | | | | | | | | | This is a no-op. * commit '5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c': thp: set duration for audio stream too Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * thp: set duration for audio stream tooPaul B Mahol2015-11-121-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '1d62ee38894afb696674db78cee8f8d89204a8fe'Derek Buitenhuis2015-11-182-0/+55
|\ \ | |/ | | | | | | | | | | * commit '1d62ee38894afb696674db78cee8f8d89204a8fe': movenc: Add a unit test for signaling of the track start times Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * movenc: Add a unit test for signaling of the track start timesMartin Storsjö2015-11-112-0/+55
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bef3b1f59f036aba4a5fe599b2480f6bd9e6b280'Derek Buitenhuis2015-11-181-4/+14
|\ \ | |/ | | | | | | | | | | * commit 'bef3b1f59f036aba4a5fe599b2480f6bd9e6b280': movenc: Allow setting start_dts/start_cts before writing actual packets Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
OpenPOWER on IntegriCloud