summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
...
* | ffmpeg: Do not discard slightly invalid timestamps.Michael Niedermayer2012-08-12
| | | | | | | | | | | | | | | | | | | | Fixes Ticket1627 The fate change is due to ffmpeg no longer pushing audio timestamps aggressively up (which is what caused the AV sync issues in the ticket) but leaving them as they are. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Allocate new buffer for bitstream filter when buffer shiftedMichael Niedermayer2012-08-10
| | | | | | | | | | | | | | fix crash with aac_adtstoasc bitstream filter Fixes Ticket1441 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: reduce excessive inlining of mpeg_motion() mpegvideo: convert mpegvideo_common.h to a .c file build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO Move MASK_ABS macro to libavcodec/mathops.h x86: move MANGLE() and related macros to libavutil/x86/asm.h x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h aacdec: Don't fall back to the old output configuration when no old configuration is present. rtmp: Add message tracking rtsp: Support mpegts in raw udp packets rtsp: Support receiving plain data over UDP without any RTP encapsulation rtpdec: Remove an unused include rtpenc: Remove an av_abort() that depends on user-supplied data vsrc_movie: discourage its use with avconv. avconv: allow no input files. avconv: prevent invalid reads in transcode_init() avconv: rename OutputStream.is_past_recording_time to finished. Conflicts: configure doc/filters.texi ffmpeg.c ffmpeg.h libavcodec/Makefile libavcodec/aacdec.c libavcodec/mpegvideo.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: factorize process_input() outMichael Niedermayer2012-08-09
| | | | | | | | | | | | | | Based-on: commit 0c00fd80ee4791bd70b634084307fc9f179e0412 Author: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'Michael Niedermayer2012-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a': avconv: send EOF to lavfi even if flushing the decoder fails avconv: get rid of pointless temporary variable. avconv: simplify transcode(). avconv: cosmetics avconv: replace no_packet array in transcode() with a var in InputStream avconv: remove unused variable from InputFile. avconv: remove commented out cruft. avconv: maintain sync on lavfi outputs. Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | dvbsub: fix encoding of termination packets.Nicolas George2012-08-09
| | | | | | | | | | | | | | | | | | | | The old code generates a termination packet with the same regions as the start packet and page_state set to "only what changed"; the result is that the termination packet is decoded as identical to the start packet. The new code does as found in some DVB broadcasts: produce a packet with no regions. This is done by expecting num_rects to be 0 rather than using a flip-flop. ffmpeg.c is updated accordingly.
* | ffmpeg: reduce difference to qatar by a few linesMichael Niedermayer2012-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) build: cosmetics: Reorder some lists in a more logical fashion x86: pngdsp: Fix assembly for OS/2 fate: add test for RTjpeg in nuv with frameheader rtmp: send check_bw as notification g723_1: clip argument for 15-bit version of normalize_bits() g723_1: use all LPC vectors in formant postfilter id3v2: Support v2.2 PIC avplay: fix build with lavfi disabled. avconv: split configuring filter configuration to a separate file. avconv: split option parsing into a separate file. mpc8: do not leave padding after last frame in buffer for the next decode call mpegaudioenc: list supported channel layouts. mpegaudiodec: don't print an error on > 1 frame in a packet. api-example: update to new audio encoding API. configure: add --enable/disable-random option doc: cygwin: Update list of FATE package requirements build: Remove all installed headers and header directories on uninstall build: change checkheaders to use regular build rules rtmp: Add a new option 'rtmp_subscribe' rtmp: Add support for subscribing live streams ... Conflicts: Makefile common.mak configure doc/examples/decoding_encoding.c ffmpeg.c libavcodec/g723_1.c libavcodec/mpegaudiodec.c libavcodec/x86/pngdsp.asm libavformat/version.h library.mak tests/fate/video.mak Merged-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 various inlined inverse AVRational with av_inv_q().Clément Bœsch2012-08-06
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2 rational: add av_inv_q() returning the inverse of an AVRational dpx: Make start offset unsigned lavfi: properly signal out-of-memory error in ff_filter_samples cosmetics: Fix a few switched periods and linebreaks zerocodec: Fix memleak in decode_frame zerocodec: Cosmetics Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ass subtitles: Fix valgrind warnings.Philip Langdale2012-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | We're now running some of this code through valgrind for the first time, and a few warnings showed up stemming from two problems. 1) The ASS code assumes the subtitle header is null terminated, but it wasn't, and passing the size down doesn't look like fun, so I added a terminator 2) The code wasn't freeing all of its state. Signed-off-by: Philip Langdale <philipl@overt.org>
* | ffmpeg: insert bitmap subtitles as video in filters.Nicolas George2012-08-04
| | | | | | | | | | | | | | | | | | With this feature, it becomes possible to perform commonly requested tasks, such as hardcoding bitmap subtitles. This will be reverted once libavfilter has proper support for subtitles. All the changes have the string "sub2video" in them, it makes it easy to spot the parts.
* | ffmpeg: honor -ss and -t parameters with muxed subtitles.Clément Bœsch2012-08-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes two things: - in case of subtitles, check_recording_time() is comparing the current PTS to the recording time (-t option, set to INT_MAX by default), so the -ss option needs to be taken into account. It is not required in do_{audio,video}_out() because this adjustment is set while polling the filtergraph (see poll_filters()). - It also adjusts the PTS sent to the encoder (and later transmitted to the muxer) so the TS in the output make sense and are not kept verbatim. Note: this only works for muxers honoring the PTS, such as lavf/matroskaenc. But for other such as the ASS muxer which just does a verbatim copy, or the SubRip muxer which doesn't write the TS in some cases, it will not work yet.
* | ffmpeg: avoid bogus error with "test.flac -c copy -f null -"Michael Niedermayer2012-08-01
| | | | | | | | | | Reported-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: init simple filter graph before trying to extract framerate from its ↵Michael Niedermayer2012-07-30
| | | | | | | | | | | | output. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: flvdec: remove spurious use of stream id lavf: deprecate r_frame_rate. lavf: round estimated average fps to a "standard" fps. Conflicts: ffmpeg.c ffprobe.c libavformat/avformat.h libavformat/electronicarts.c libavformat/flvdec.c libavformat/rawdec.c libavformat/utils.c tests/ref/fate/iv8-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'Michael Niedermayer2012-07-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23': lavf: use dts difference instead of AVPacket.duration in find_stream_info() avf: introduce nobuffer option fate: make yadif tests consistent across systems vf_hqdn3d: support 9 and 10bit colordepth vf_hqdn3d: reduce intermediate precision vf_hqdn3d: simplify and optimize factor identical ff_inplace_start_frame out of two filters vf_hqdn3d: cosmetics avprobe/avconv: fix tentative declaration compile errors on MSVS. Conflicts: doc/APIchanges ffmpeg.c ffprobe.c libavformat/avformat.h libavformat/options_table.h libavformat/utils.c libavformat/version.h tests/fate/filter.mak tests/ref/fate/filter-yadif-mode0 tests/ref/fate/filter-yadif-mode1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: allow using the r_frame_rate as fundamental timebase for stream copy ↵Michael Niedermayer2012-07-28
| | | | | | | | | | | | | | | | in avi Fixes Ticket1434 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add code to perform ts wrap correctionMichael Niedermayer2012-07-28
| | | | | | | | | | | | Fixes ticket1385 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: doxyfy some comments and mention the timebase used in various ↵Michael Niedermayer2012-07-26
| | | | | | | | | | | | timestamp fields. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: move decoded_frame->pts computation togetherMichael Niedermayer2012-07-26
| | | | | | | | | | | | This clarifies the code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix rounding errors in decoded_frame->pts computationMichael Niedermayer2012-07-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix assumed decoded_frame->pts timebaseMichael Niedermayer2012-07-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: reset decoded_frame->pts after rescaling.Michael Niedermayer2012-07-26
| | | | | | | | | | | | | | This ensures its not used afterwards. This commit should not change anything as it should not have been used afterwards. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix units of next_?ts in debug printing routine.Michael Niedermayer2012-07-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: warn about new streams after startup.Nicolas George2012-07-26
| |
* | ffmpeg: keep packet/frame availability in global structures.Nicolas George2012-07-24
| | | | | | | | This replaces the use of the no_packet and no_frame arrays.
* | ffmpeg: select input file based on output time.Nicolas George2012-07-23
| | | | | | | | | | | | | | | | | | Filters can change the timings, so input files must not necessarily be read at the same rythm. This patch select the input file to read based on the timestamp at output instead of input. With complex filter graphs, finding the input for a given output is done by making a request and checking to what buffer source it has been forwarded.
* | ffmpeg: probe buffersinks once more after EOF.Nicolas George2012-07-20
| | | | | | | | | | | | | | | | Reap buffers stored in the buffer sinks even when the avfilter_graph_request_oldest() loop only returns EOF. avfilter_graph_request_oldest() can cause frames to arrive to the sinks even when it returns EOF.
* | Revert "ffmpeg: set pkt_timebase"Nicolas George2012-07-19
| | | | | | | | | | | | | | | | This reverts commit 744bd8d08c18d68d92ead091c7e335b4b07459aa. pkt_timebase is now set by av_codec_set_pkt_timebase. If some demuxer set AVStream.time_base directly, it need to be fixed. There is a warning to detect it.
* | ffmpeg: add -(no)stdin option.Nicolas George2012-07-19
| | | | | | | | | | | | | | Allows to disable interaction from standard input. Useful, for example, if ffmpeg is in the background process group. Roughly the same result can be achieved with "ffmpeg ... < /dev/null" but it requires a shell.
* | ffmpeg: invert using_stdin and rename accordingly.Nicolas George2012-07-19
| | | | | | | | There are other reasons not to use stdin than having it as an input.
* | ffmpeg: revert 3ba90d9 (cosmetics to reduce difference to qatar by about 90 ↵Michael Niedermayer2012-07-18
| | | | | | | | | | | | | | | | lines) This commit caused Ticket1490 (Infinity loop / lock in export image) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libopenjpeg: introduce encoding support libopenjpeg: rename decoder source file. RTMPTS protocol support RTMPS protocol support avconv: print an error message when demuxing fails. tscc2: DCT output should not be clipped rtmp: Rename rtmphttp to ffrtmphttp Conflicts: Changelog configure doc/general.texi libavcodec/libopenjpegenc.c libavcodec/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix streamcopy of some mp3 in aviMichael Niedermayer2012-07-16
| | | | | | | | | | | | | | Fixes Ticket1432 Thanks-to: Mike Scheutzow <mike.scheutzow@alcatel-lucent.com> for some of the bug analysis Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add -progress option.Nicolas George2012-07-14
| | | | | | | | | | It allows to send program-friendly (easy to parse) progress information to a file or an URL.
* | ffmpeg: use pkt_pts before pkt->pts for audioMichael Niedermayer2012-07-14
| | | | | | | | | | | | This fixes the timestamp of the first packet when samples have been skiped. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: set pkt_timebaseMichael Niedermayer2012-07-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix type of av_log() argumentMichael Niedermayer2012-07-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | add output for frame timestampsRobert Krüger2012-07-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: poll filters even after -t limit.Nicolas George2012-07-06
| | | | | | | | | | If not, frames can still arrive to the sink and accumulate. The frames past recording time will be ignored in do_*_out.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: qdm2: remove broken and disabled dump_context() debug function x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros x86inc: modify ALIGN to not generate long nops on i586 x86: h264_intrapred: port to cpuflag macros avplay: update input filter pointer when the filtergraph is reset. avconv: fix parsing of -force_key_frames option. h264: use templates to avoid excessive inlining xtea: Make the count parameter match the documentation blowfish: Make the count parameter match the documentation mpegvideo: Don't use ff_mspel_motion() for vc1 xtea: invert branch and loop precedence blowfish: invert branch and loop precedence flvdec: optionally trust the metadata avconv: Set audio filter time base to the sample rate vp8: Add ifdef guards around the sse2 loopfilter in the sse2slow branch too Conflicts: ffmpeg.c ffplay.c libavcodec/h264.c libavcodec/mpegvideo_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: rework checks for the -t option.Nicolas George2012-07-04
| | | | | | | | | | | | | | | | | | | | | | This commit is based on libav's implementation and makes sure to compare output timestamps together. It also reduces the differences with avconv. The changes to the test reference files are caused by an additional packet at the end, the timestamp of the frame encoded by this packet is always strictly below the limit stated by the -t option.
* | ffmpeg: Add sanity check on frame duplicationMichael Niedermayer2012-07-04
| | | | | | | | | | | | | | This prevents long loops and OOM in case of damaged timestamps in some cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section. dnxhdenc: add space between function argument type and comment. x86: fmtconvert: add special asm for float_to_int16_interleave_misc_* attributes: Add a definition of av_always_inline for MSVC cmdutils: Pass the actual chosen encoder to filter_codec_opts os_support: Add fallback definitions for stat flags os_support: Rename the poll fallback function to ff_poll network: Check for struct pollfd os_support: Don't compare a negative number against socket descriptors os_support: Include all the necessary headers for the win32 open function x86: vc1: fix and enable optimised loop filter Conflicts: cmdutils.c cmdutils.h ffmpeg.c ffplay.c libavformat/os_support.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: re-set frame_size after filter graph reset.Nicolas George2012-06-30
| | | | | | | | | | The filter contexts are completely cleared, so the frame size can not be kept.
* | ffmpeg: use the more powerful version of abuffersink.Nicolas George2012-06-30
| |
* | ffmpeg: fix parsing of -force_key_frames option.Nicolas George2012-06-30
| | | | | | | | | | Identical to commit 4f6a1c9 by Reimar Döffinger, that was lost after the merge of 19ad567.
* | ffmpeg: fix a memleak in subtitles decoding.Clément Bœsch2012-06-29
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 20:07:10 +0000