aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | matroskadec: add assert on lack of overflow in pkt_size+offsetMichael Niedermayer2012-06-151-0/+1
| | | | | | | | | | | | | | | | currently a overflow there should be impossible but future changes to the code could easily introduce a bug that no longer limits the 2 values sufficiently so better protect it via av_assert. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: change size check in matroska_decode_buffer() to unsignedMichael Niedermayer2012-06-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: move lace_size check up so it catches all code pathesMichael Niedermayer2012-06-151-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: change assert to av_assert0()Michael Niedermayer2012-06-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix incorrect unsigned->signed conversion.Dale Curtis2012-06-151-1/+2
| | | | | | | | | | Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-154-4/+57
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Avoid C99 variable declarations within for statements. rtmp: Read and handle incoming packets while writing data doc: document THREAD_TYPE fate variable rtpdec: Don't require frames to start with a Mode A packet avconv: don't try to free threads that were not initialized. Conflicts: doc/fate.texi ffplay.c libavdevice/dv1394.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Read and handle incoming packets while writing dataSamuel Pitoiset2012-06-143-3/+56
| | | | | | | | | | | | | | | | | | | | | | This makes sure all incoming packets are read and handled (and reacted to) while sending an FLV stream over RTMP to a server. If there were enough incoming data to fill the TCP buffers, this could potentially make things block at unexpected places. For the upcoming RTMPT support, we need to consume all incoming data before we can send the next request. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Don't require frames to start with a Mode A packetMartin Storsjö2012-06-141-1/+1
| | | | | | | | | | | | | | | | While there is no reason for starting a frame with anything else than a Mode A packet, some senders seem to consistently use Mode B packets for everything. This fixes depacketization of such streams. Signed-off-by: Martin Storsjö <martin@martin.st>
* | riff: use av_assertMichael Niedermayer2012-06-141-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rawdec: use av_assert()Michael Niedermayer2012-06-141-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pcmdec: use av_assert()Michael Niedermayer2012-06-141-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: fix returned error codesMartin T. H. Sandsmark2012-06-141-14/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-131-24/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time rtmp: Set the client buffer time to 3s instead of 0.26s rtmp: Handle server bandwidth packets rtmp: Display a verbose message when an unknown packet type is received lavfi/audio: use av_samples_copy() instead of custom code. configure: add all filters hardcoded into avconv to avconv_deps avfiltergraph: remove a redundant call to avfilter_get_by_name(). lavfi: allow building without swscale. build: Do not delete tests/vsynth2 directory, which is no longer created. lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs lavfi: make AVFilterPad opaque after two major bumps. lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name(). lavfi: make avfilter_get_video_buffer() private on next bump. jack: update to new latency range API as the old one has been deprecated rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r ppc: Rename H.264 optimization template file for consistency. lavfi: add channelsplit audio filter. golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls() sws: fix planar RGB input conversions for 9/10/16 bpp. Conflicts: Changelog configure doc/APIchanges ffmpeg.c libavcodec/golomb.h libavcodec/v210dec.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/formats.c libavfilter/version.h libavfilter/vf_frei0r.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.h libavfilter/vsrc_color.c libavformat/rtmpproto.c libswscale/input.c tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Add a new option 'rtmp_buffer', for setting the client buffer timeSamuel Pitoiset2012-06-131-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Set the client buffer time to 3s instead of 0.26sSamuel Pitoiset2012-06-131-17/+29
| | | | | | | | | | | | | | | | This factorizes existing code into a new function gen_buffer_time(), which generates the client buffer time message and sends it to the server. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Handle server bandwidth packetsSamuel Pitoiset2012-06-131-1/+11
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Display a verbose message when an unknown packet type is receivedSamuel Pitoiset2012-06-131-0/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Tokenize the AMF connection parameters manually instead of using strtok_rMartin Storsjö2012-06-131-6/+19
| | | | | | | | | | | | This fixes builds on platforms without strtok_r (windows). Signed-off-by: Martin Storsjö <martin@martin.st>
* | nutenc: use av_assertMichael Niedermayer2012-06-131-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegtsenc: use av_assertMichael Niedermayer2012-06-131-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-121-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avfilter: Log an error if avfilter fails to configure a link. avconv: support only native pthreads. rtmp: Fix a possible access to invalid memory location when the playpath is too short. Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Fix a possible access to invalid memory location when the playpath is ↵Samuel Pitoiset2012-06-121-2/+2
| | | | | | | | | | | | too short. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf: add a "warning" when discarding a oddly backward subtitle or data ↵Michael Niedermayer2012-06-121-0/+3
| | | | | | | | | | | | | | starttime Idea-by: ohsix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: handle data like subtitles in start time calculation.Michael Niedermayer2012-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | This fixes an issue with a crazy data track starting with a large negative timestamp. It could as well be solved in all user apps, but this is looking attractively simpler ... Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtmpproto: replace strtok_r by av_strtok its unavailable in mingwMichael Niedermayer2012-06-111-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-111-2/+83
|\| | | | | | | | | | | | | | | | | * qatar/master: rtmp: Do not send extension for flv files rtmp: support connection parameters doc: Add documentation for the newly added rtmp_* options Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Do not send extension for flv filesSamuel Pitoiset2012-06-111-2/+6
| | | | | | | | | | | | This fixes bugzilla bug #304. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: support connection parametersSamuel Pitoiset2012-06-111-0/+77
| | | | | | | | | | | | | | | | | | Allow using connection parameters in order to append arbitrary AMF data like "B:1 S:authMe O:1 NN:code:1.23 NS:flag:ok O:0" to the Connect message. You can pass these parameters through the -rtmp_conn option. Signed-off-by: Martin Storsjö <martin@martin.st>
* | flvenc: use av_assert instead of assertMichael Niedermayer2012-06-111-3/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: export orphan tmcd track metadata to global format metadata.Clément Bœsch2012-06-111-0/+37
| |
* | mov: copy timecode metadata from tmcd track to the related video stream.Clément Bœsch2012-06-111-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple softwares seem not to add a tref for the timecode (the next commit fixes this issue), but at least FFmpeg does. This can be used to generate a sample that demonstrates the feature: ./ffmpeg -f lavfi -i testsrc \ -f lavfi -i mptestsrc \ -f lavfi -i rgbtestsrc \ -map 0 -map 1 -map 2 \ -metadata:s:0 timecode=00:00:00:12 \ -metadata:s:2 timecode=01:02:12:20 \ -t 10 -y out.mov ./ffprobe out.mov The timecode metadata being transmitted to the video streams, it can be kept while transmuxed/transcoded.
* | mov: parse tref atom.Clément Bœsch2012-06-112-1/+29
| |
* | movenc: add timecode track support.Clément Bœsch2012-06-112-7/+143
| |
* | riff: add ISMP/timecode tag.Clément Bœsch2012-06-111-1/+2
| |
* | mpegtsenc: prevent pcr_packet_period==0Michael Niedermayer2012-06-101-0/+2
| | | | | | | | | | | | a period of 1 is the smallest that makes sense Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-091-3/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: allow cropping to AVCodecContext.width/height mov: set AVCodecContext.width/height for h264 iac: generate codec tables as they are supposed to be indeo4: handle frame type 1 properly lavu: change versioning script to include all av* prefixed symbols Conflicts: libavcodec/h264.c libavutil/libavutil.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: set AVCodecContext.width/height for h264Mans Rullgard2012-06-091-3/+0
| | | | | | | | | | | | | | This is required for correct cropping of files from Canon cameras. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavf/bintext: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradataMichael Niedermayer2012-06-091-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bink: check av_mallocz() return valuePaul B Mahol2012-06-091-0/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Fix latm muxer Makefile dependencies.Carl Eugen Hoyos2012-06-081-1/+1
| | | | | | | | | | | | Found, analysed and tested by trac user Jamal. Fixes part of ticket #1428.
* | Fix jacosub muxer Makefile dependencies.Carl Eugen Hoyos2012-06-081-1/+1
| | | | | | | | | | | | Found, analysed and tested by trac user Jamal. Fixes part of ticket #1428.
* | mpegtsenc: make pts/dts offseting optionalMichael Niedermayer2012-06-081-6/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-071-8/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegts: Remove disabled extension matching probe. fate: avoid freopen(NULL) in videogen/rotozoom Conflicts: tests/rotozoom.c tests/videogen.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Remove disabled extension matching probe.Alex Converse2012-06-071-8/+0
| |
* | swfenc: use av_assertMichael Niedermayer2012-06-071-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xmv: use av_assertMichael Niedermayer2012-06-071-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: fix missing "parser not found" messageMichael Niedermayer2012-06-071-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfenc: write optional field dominance flag in picture descriptionMatthieu Bouron2012-06-061-1/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-062-32/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fifo.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Probe codecs at score 0 on buffer exhaustion conditions.Alex Converse2012-06-051-12/+24
| |