summaryrefslogtreecommitdiff
path: root/libavformat/nutdec.c
Commit message (Collapse)AuthorAge
* nut: Fix unchecked allocationsDerek Buitenhuis2013-10-22
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avformat: use ff_alloc_extradata()Paul B Mahol2013-10-13
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/nutdec: check for allocation failuresPaul B Mahol2013-09-11
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* nutdec: use ff_find_last_ts()Michael Niedermayer2013-07-06
| | | | | | Fixes finding the duration for nut files that are truncated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'Michael Niedermayer2013-05-08
|\ | | | | | | | | | | | | | | | | | | | | | | * commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe': nut: use meaningful error values FATE: use a less ambiguous end time for filter-trim-time test Conflicts: libavformat/nutdec.c tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: use meaningful error valuesLuca Barbato2013-05-07
| | | | | | | | Fix the mispresented EINVAL for EOF on partial files, among the other.
* | Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'Michael Niedermayer2013-05-06
|\| | | | | | | | | | | | | | | * commit '46c1917350f58dfab84e41919e6c02d43950db8c': nut: use a define for the nut version bgmc: Do not mark ff_bgmc_decode_init() as av_cold Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: use a define for the nut versionLuca Barbato2013-05-06
| | | | | | | | Ease switching version in the future and make evident why that value.
| * nutdec: Always return a value from nut_read_timestamp()Diego Biurrun2013-01-15
| | | | | | | | | | | | | | | | | | The function is a callback that is called by ff_gen_search with a constant stream index. Avoid a false positive on older gcc version. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | nutdec: Implement duration parsing for indexed nutsMichael Niedermayer2013-05-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: more specific return codes for decode_syncpoint()Michael Niedermayer2013-03-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: print error on invalid/unsupported fourcc styleMichael Niedermayer2013-03-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: sanity check r_frame_rateMichael Niedermayer2012-12-18
| | | | | | | | | | | | This fixes files that store a somewhat incorrect value. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer2012-11-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfe5454cd238b16e7977085f880205229103eccb': lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h lavf: move "MP3 " fourcc from riff to nut fate: vpx: Add dependencies fate: Fix wavpack-matroskamode test dependencies x86: dsputilenc: port to cpuflags Conflicts: libavformat/internal.h libavformat/nut.c tests/fate/vpx.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.hJustin Ruggles2012-11-28
| |
* | Merge commit '381dc1a5ec0925b281c573457c413ae643567086'Michael Niedermayer2012-10-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '381dc1a5ec0925b281c573457c413ae643567086': fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups fate: Add shorthands for acodec PCM and ADPCM tests avconv: Drop unused function argument from do_video_stats() cmdutils: Conditionally compile libswscale-related bits aacenc: Drop some unused function arguments rtsp: Avoid a cast when calling strtol nut: support textual data nutenc: verbosely report unsupported negative pts Conflicts: cmdutils.c ffmpeg.c libavformat/nut.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: support textual dataLuca Barbato2012-10-29
| | | | | | | | Plain text (utf8 encoded) data can be muxed and demuxed in nut.
* | nutdec: fix integer overflowMichael Niedermayer2012-10-20
| | | | | | | | | | Fixes CID700575 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: check return value of av_new_packet()Paul B Mahol2012-10-15
| | | | | | | | | | | | Fixes CID733173. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'Michael Niedermayer2012-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520': configure: tms470: add mapping for -mfpu=vfpv3-d16 flag configure: recognise Minix as OS configure: work around bug in ash shell eval-test: make table static const lavr: handle clipping in the float to s32 conversion nut: support pcm codecs not mapped in avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: support pcm codecs not mapped in aviLuca Barbato2012-10-13
| | | | | | | | The native tags will be used when available.
* | Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f'Michael Niedermayer2012-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bd442c276e6688b43777a198cad0d7e3a92123f': nut: prioritize native tags Conflicts: tests/ref/lavfi/crop tests/ref/lavfi/crop_scale tests/ref/lavfi/crop_scale_vflip tests/ref/lavfi/crop_vflip tests/ref/lavfi/null tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_pad tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip tests/ref/lavfi/scale200 tests/ref/lavfi/scale500 tests/ref/lavfi/vflip tests/ref/lavfi/vflip_crop tests/ref/lavfi/vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: prioritize native tagsLuca Barbato2012-10-13
| | | | | | | | | | Use native tags instead of avi ones, simplifies a lot raw video codecs handling.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: fix Thumb PIC on Apple nut: add do {} while (0) to GET_V tiffenc: Check av_malloc() results. tiffenc: Simplify pixel format setup using AVPixFmtDescriptor. Use atexit() instead of defining a custom exit_program() interface. msvc: Fix detection of VFW & Avisynth required libs Conflicts: ffmpeg.c ffmpeg_opt.c ffplay.c ffprobe.c ffserver.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: add do {} while (0) to GET_VLuca Barbato2012-10-02
| | | | | | | | Make it consistent with the other function-like macros.
| * nutdec: Remove unused and broken debug function stubDiego Biurrun2012-09-27
| |
* | nut: store and read the r_frame_rateMichael Niedermayer2012-10-02
| | | | | | | | | | | | | | With this, when we use a finer timebase than neccessary to store durations the demuxer still knows what the original timebase was. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: fix get_vb_trace() / -DTRACE compileMichael Niedermayer2012-09-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: nutdec: const correctness for get_v_trace/get_s_trace function arguments truemotion2: Request samples for old TM2 headers rtpdec: Remove a useless ff_ prefix from a static symbol rtpdec: Support depacketizing speex rtpenc: Add support for packetizing speex Conflicts: libavformat/rtpdec.c libavformat/sdp.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutdec: const correctness for get_v_trace/get_s_trace function argumentsDiego Biurrun2012-09-26
| |
* | nutdec: fix mixup of nb_streams and timebase_countMichael Niedermayer2012-09-21
| | | | | | | | | | | | Fixes out of array read, should fix ffprove fate failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: fix type of intermediate variable for ts calculation.Michael Niedermayer2012-09-21
| | | | | | | | | | | | | | Prior to this it could theoretically become negative and read out of array. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use correct format identifier for uint64_t.Carl Eugen Hoyos2012-08-27
| |
* | nutdec: Flip the direction for seeking with an index in the failure case.Michael Niedermayer2012-08-26
| | | | | | | | | | | | This is closer to how seeking works without an index Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: improve information in error messageMichael Niedermayer2012-08-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-07
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avformat: Drop pointless "format" from container long names swscale: bury one more piece of inline asm under HAVE_INLINE_ASM. wv: K&R formatting cosmetics configure: Add missing descriptions to help output h264_ps: declare array of colorspace strings on its own line. fate: amix: specify f32 sample format for comparison tiny_psnr: support 32-bit float samples eamad/eatgq/eatqi: call special EA IDCT directly eamad: remove use of MpegEncContext mpegvideo: remove unnecessary inclusions of faandct.h af_asyncts: avoid overflow in out_size with large delta values af_asyncts: add first_pts option Conflicts: configure libavcodec/eamad.c libavcodec/h264_ps.c libavformat/crcenc.c libavformat/ffmdec.c libavformat/ffmenc.c libavformat/framecrcenc.c libavformat/md5enc.c libavformat/nutdec.c libavformat/rawenc.c libavformat/yuv4mpeg.c tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Drop pointless "format" from container long namesDiego Biurrun2012-07-30
| |
* | nutdec: set duration_estimation_methodMichael Niedermayer2012-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: estimate duration from last syncpointMichael Niedermayer2012-06-30
| | | | | | | | | | | | Previously nut used the fallback of estimation by bitrate. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: remove assert that is wrong for some new duration code.Michael Niedermayer2012-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: check that filesize is valid before using it.Michael Niedermayer2012-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add AVFMT_SEEK_TO_PTS to nut demuxer flagsMichael Bradshaw2012-05-16
| | | | | | | | | | Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: minor simplification.Reimar Döffinger2012-04-29
| | | | | | | | | | | | | | Also fixes an (incorrect) "control reaches end of non-void function" warning with some compilers. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | nutdec: replace assert with av_assert0.Reimar Döffinger2012-04-29
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dv: Initialize encoder tables during encoder init. dv: Replace some magic numbers by the appropriate #define. FATE: pass the decoded output format and audio source file to enc_dec_pcm FATE: specify the input format when decoding in enc_dec_pcm() x86inc: support AVX abstraction for 2-operand instructions configure: detect PGI compiler and set suitable flags avconv: check for an incompatible changing channel layout avio: make AVIOContext.av_class pointer to const nutdec: add malloc check and fix const to non-const conversion warnings Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutdec: add malloc check and fix const to non-const conversion warningsMans Rullgard2012-04-18
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avplay: Don't free video filters string until the end of decoding. movenc: small refactor mov_write_packet movenc: remove redundant check interplayvideo: fix av_dlog parameter type mismatch Drop some pointless #ifdefs. Conflicts: libavcodec/interplayvideo.c libavcodec/libxvidff.c libavcodec/snowenc.c libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop some pointless #ifdefs.Diego Biurrun2012-04-10
| | | | | | | | The files are only compiled if the #ifdef conditions are met.