summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* lavf: fix a few typo in some comments.Clément Bœsch2012-09-05
|
* lavf: remove a few useless AV_NOWARN_DEPRECATED().Clément Bœsch2012-09-05
| | | | read_seek was undeprecated in e5c708151.
* Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'Michael Niedermayer2012-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078': avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member Conflicts: libavcodec/libvpxenc.c libavcodec/options_table.h libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union memberMartin Storsjö2012-09-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer2012-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '124134e42455763b28cc346fed1d07017a76e84e': avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member Conflicts: libavcodec/aacenc.c libavcodec/libopenjpegenc.c libavcodec/options_table.h libavdevice/bktr.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/vf_drawtext.c libavformat/movenc.c libavformat/options_table.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union memberMartin Storsjö2012-09-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: add support for bdver1 and bdver2 CPU types. avio: make avio_close NULL the freed buffer pixdesc: cosmetics proresenc: Don't free a buffer not owned by the codec proresenc: Write the full value in one put_bits call adpcmenc: Calculate the IMA_QT predictor without overflow x86: Add convenience macros to check for CPU extensions and flags x86: h264dsp: drop some unnecessary ifdefs around prototype declarations mss12: merge decode_pixel() and decode_top_left_pixel() mss12: reduce SliceContext size from 1067 to 164 KB mss12: move SliceContexts out of the common context into the codec contexts Conflicts: libavformat/aviobuf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: make avio_close NULL the freed bufferLuca Barbato2012-09-04
| |
* | lavf/segment: add EXT-X-MEDIA-SEQUENCE tag in M3U8 headerStefano Sabatini2012-09-04
| |
* | lavf/segment: deprecate "ext" format in favor of "csv"Stefano Sabatini2012-09-04
| | | | | | | | The new option name is more descriptive.
* | lavf/segment: add escaping for filename field of the CSV list fileStefano Sabatini2012-09-04
| | | | | | | | CSV escaping code is borrowed from ffprobe.c.
* | tty: return av_get_packet() error codes instead of converting them to EIOPeter Ross2012-09-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tty: return EOF when the 'effective' end of file is reached. ('effective' ↵Peter Ross2012-09-04
| | | | | | | | | | | | because ansi/tty files may be concatenated with SAUCE/EFI metadata) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rmdec: remove unused variableMichael Niedermayer2012-09-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/segment: set EXT-X-VERSION to 3 rather than to 4Stefano Sabatini2012-09-02
| | | | | | | | | | | | | | | | There is nothing we use of the latest version, downgrade version number to increase decoding support. Based on this comment by vel2000: http://ffmpeg.org/trac/ffmpeg/ticket/1642#comment:17
* | flvdec: fix creation of lots of phantom data streamsMichael Niedermayer2012-09-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | psxstr: more correct array type.Michael Niedermayer2012-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix flv new stream handling after head already parsedRoman Arutyunyan2012-09-01
| | | | | | | | | | | | | | | | | | | | | | This fixes stream lookup in flv demuxer. When used with librtmp protocol streams are sometimes added after head arrived. If the first stream added in flv header reader is Audio stream then it is messed with Video stream added later in the code patched. The result is I have 2 Audio streams (first of them is said to have a video codec like h264) instead of Audio/Video pair. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add missing new line to some error messages 2Piotr Bandurski2012-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add missing new line to some error messagesPiotr Bandurski2012-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Remove a stray double space Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_* Conflicts: libavfilter/vf_delogo.c libavfilter/vf_lut.c libavfilter/vsrc_testsrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * crypto: Remove a stray double spaceMartin Storsjö2012-08-31
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | matroskadec, matroskadec, srtenc: Read/Write duration for subtitles.Philip Langdale2012-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After much discussion and back-and-forth, we reached the conclusion that matroska uses convergence_duration for subtitle duration because a 32bit value isn't large enough to store the duration if sub-micro-second timebases are used. Matroska may not be the only one that supports these timebases, but it's certainly the only one that ffmpeg attempts to support in this way. The long term solution that we seemed to reach was that if we encounter a matroska file with a sub-micro-second timebase, we should internally scale it up to at least micro-second, and then duration can be used normally. This suggests that on the encode side, we should not allow generation of files with sub-micro-second timebases, but that's a separate issue. That being a non-trivial change, and the subtitle interoperability breakage being very real, I'm re-submitting this small change for consideration. In this diff, we make sure that duration is populated by the matroska demuxer, and that convergence_duration is respected in matroskaenc and srtenc, but that duration is used otherwise. This ends up being a strict improvement - pipelines that use convergence duration are unchanged, and ones that are currently broken due to the duration mismatch will start working - except for the ones with the extreme timebases, but those were already broken. Signed-off-by: Philip Langdale <philipl@overt.org>
* | flic: use AV_LOG_ERROR for error messagePiotr Bandurski2012-08-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | filmstripdec: add new line to error messagePiotr Bandurski2012-08-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wtvdec: set correct codec ID for CC streams.Reimar Döffinger2012-08-31
| | | | | | | | | | | | | | | | | | | | | | | | Closed caption data is definitely not teletext. Since it contains a EIA-608 compatibility stream, the EIA_608 codec ID is at least not completely wrong. Fixes subtitle playback in MPlayer with the sample in trac ticket #1482. To fix the ticket itself I expect FFmpeg will need a closed-caption to SRT decoder first. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | flvdec: remove duplicate returnMichael Niedermayer2012-08-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bintext: remove stray ;Michael Niedermayer2012-08-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: MSS1 and MSS2: set final pixel format after common stuff has been initialised MSS2 decoder configure: handle --disable-asm before check_deps x86: Split inline and external assembly #ifdefs configure: x86: Separate inline from standalone assembler capabilities pktdumper: Use a custom define instead of PATH_MAX for buffers pktdumper: Use av_strlcpy instead of strncpy pktdumper: Use sizeof(variable) instead of the direct buffer length Conflicts: Changelog configure libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/dct-test.c libavcodec/imgconvert.c libavcodec/mss12.c libavcodec/version.h libavfilter/x86/gradfun.c libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * MSS2 decoderAlberto Delmás2012-08-31
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * build: allow non-standard variations of linker -l/-L flagsMans Rullgard2012-08-29
| | | | | | | | | | | | | | | | | | This enables replacing the -l and -L flags used to specify the just-built libraries when linking the tools and shared libs with non-standard syntaxes. System library flags are already handled by the filtering mechanism in configure. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | find_stream_info: update last_dts more oftenMichael Niedermayer2012-08-30
| | | | | | | | | | | | | | This improves dts validity checks and consequently fps detection of files with invalid dts Fixes Ticket1681 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: fix const correctnessMichael Niedermayer2012-08-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvenc: kill a uninitialized variable warning.Michael Niedermayer2012-08-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ac3dec: fix uninitialized var warningMichael Niedermayer2012-08-30
| | | | | | | | | | | | This commit should be purely cosmetic Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix av_log int typeMichael Niedermayer2012-08-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'Michael Niedermayer2012-08-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112': configure: support Bitrig OS yuv2rgb: handle line widths that are not a multiple of 4. graph2dot: Use the fallback getopt implementation if needed tools: Include io.h for open/read/write/close if unistd.h doesn't exist testprogs: Remove unused includes qt-faststart: Use other seek/tell functions on MSVC than on mingw ismindex: Include direct.h for _mkdir on windows sdp: Use static const char arrays instead of pointers to strings x86: avcodec: Drop silly "_mmx" suffixes from filenames x86: avcodec: Drop silly "_sse" suffixes from filenames sdp: Include profile-level-id for H264 utvideoenc: use ff_huff_gen_len_table huffman: add ff_huff_gen_len_table cllc: simplify/fix swapped data buffer allocation. rtpdec_h264: Don't set the pixel format h264: Check that the codec isn't null before accessing it audio_frame_queue: Define af_queue_log_state before using it Conflicts: libavcodec/audio_frame_queue.c libavcodec/h264.c libavcodec/huffman.h libavcodec/huffyuv.c libavcodec/utvideoenc.c libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sdp: Use static const char arrays instead of pointers to stringsMartin Storsjö2012-08-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * sdp: Include profile-level-id for H264Martin Storsjö2012-08-28
| | | | | | | | | | | | | | This is required for playback with the Stagefright RTSP framework on Android. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec_h264: Don't set the pixel formatSamuel Pitoiset2012-08-28
| | | | | | | | | | | | | | There is no need for this depacketizer to set the pixel format, the decoder can do that just fine. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Add 'timeout' option to UDP protocolAndrey Utkin2012-08-29
| | | | | | | | | | | | This patch accepts 'timeout' option for input mode only. As far as i know, UDP output cannot introduce delays. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add 'rw_timeout' into URLContextAndrey Utkin2012-08-29
| | | | | | | | | | | | | | | | If set non-zero, limits duration of retry_transfer_wrapper() loop, thus affects ffurl_read*(), ffurl_write() Measured in microseconds. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtpenc_xiph: switch to av_assertMichael Niedermayer2012-08-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aiffdec: support QDM2Michael Niedermayer2012-08-28
| | | | | | | | | | | | Fixes ticket204 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: support for itunes tempo tagKari Lentz2012-08-27
| | | | | | | | | | | | Implements support for tmpo atom for mp4 files, typically used to store BPM. -metadata "tmpo=127" as a command line option will record 127 as the BPM in the meta data. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aiffdec: try #2 to fix bpsMichael Niedermayer2012-08-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vf_hqdn3d: Don't declare the loop variable within the for loop huffyuv: update to current coding style huffman: update to current coding style rtsp: Free the rtpdec context properly build: fft: x86: Drop unused YASM-OBJS-FFT- variable Conflicts: libavcodec/huffman.c libavcodec/huffyuv.c libavcodec/x86/Makefile libavfilter/vf_hqdn3d.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Free the rtpdec context properlyMartin Storsjö2012-08-27
| | | | | | | | | | | | | | | | | | The condition for calling the rtpdec cleanup was broken in df8cf076c86. This fixes a memory leak. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 02:13:20 +0000