summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg: do not call exit from exit_program()Michael Niedermayer2013-02-061-2/+1
| | | | | | This should fix Ticket2116 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: implement -force_key_frames expression evalutionStefano Sabatini2013-01-271-5/+60
|
* ffmpeg: support filtering of unknown channel layouts.Nicolas George2013-01-261-1/+1
|
* ffmpeg: add -guess_layout_max option.Nicolas George2013-01-261-0/+2
|
* ffmpeg: copy tmcd track timebase parametersMichael Niedermayer2013-01-241-0/+6
| | | | | | Fixes part of Ticket2045 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'd9bf716945046333c24580d538f450b516f15710'Michael Niedermayer2013-01-211-1/+1
|\ | | | | | | | | | | | | | | * commit 'd9bf716945046333c24580d538f450b516f15710': ppc: vorbisdsp: Drop some unnecessary #includes avconv: Increase the SDP buffer size to fit xiph SDPs Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: accept "chapters" as forced key frames.Nicolas George2013-01-191-7/+45
| | | | | | | | Allow to force a key frame at the beginning of each chapter.
* | Use new function av_codec_get_tag2() in ffmpeg.c.Carl Eugen Hoyos2013-01-171-1/+2
| | | | | | | | Fixes ticket #1953.
* | add note on windows piperogerdpack2013-01-061-1/+3
| | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove annoying logs and improve reporting in case of unavailable ↵Stefano Sabatini2012-12-271-13/+11
| | | | | | | | bitrate
* | Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer2012-12-201-14/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06': avconv: use new options parser. Conflicts: ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix shortest with libx264Michael Niedermayer2012-12-191-3/+2
| | | | | | | | | | | | | | Encoders that buffer a significant number of frames where a "few" frames off with -shortest Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: replace magic number with VSYNC_CFRPeter Ross2012-12-161-1/+1
| |
* | ffmpeg: sub2video: use start and end time.Nicolas George2012-12-121-3/+17
| | | | | | | | | | | | | | Until now, the end_display_time was ignored, making single packets subtitles (like dvdsub) stay indefinitely. start_display_time was also ignored, but is it almost always 0.
* | ffmpeg: small indent fix.Clément Bœsch2012-12-041-1/+1
| |
* | ffmpeg: use the correct variables in do_video_stats()Michael Niedermayer2012-12-041-4/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Update video stats log during encode flushThierry Foucu2012-12-041-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix mixed declarations and statements.Michael Niedermayer2012-11-241-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Correct starttime based on non discarded streams.Michael Niedermayer2012-11-241-0/+19
| | | | | | | | | | | | Fixes Ticket1830 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: minor simplification of wraping codeMichael Niedermayer2012-11-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add setting of field_order flagTim Nicholson2012-11-221-0/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix weird reindentStefano Sabatini2012-11-221-13/+13
| |
* | ffmpeg: print debug_ts off and off_time values with timestamp helper routinesStefano Sabatini2012-11-221-4/+6
| |
* | ensure comment blocks that contain doxygen commands start with double asterixPeter Ross2012-11-211-1/+1
| | | | | | | | | | Reveiwed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: rework debugging timestamp logs in process_input()Stefano Sabatini2012-11-201-11/+19
| | | | | | | | | | Print timestamps before and after ffmpeg timestamp postprocessing. Help to debug how ffmpeg processes the input timestamps.
* | ffmpeg: fix double ;;Michael Niedermayer2012-11-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix audio timestamps on stream copy with -ssMichael Niedermayer2012-11-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix the packet duration when flushing the encoder.Thierry Foucu2012-11-071-0/+2
| | | | | | | | | | | | A similar patch was posted by Justin Ruggles <justin.ruggles@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'Michael Niedermayer2012-11-031-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '9221efef7968463f3e3d9ce79ea72eaca082e73f': lavf: fix av_interleaved_write_frame() doxy. lavf: clarify the lifetime of demuxed packets. avconv: do not free muxed packet on streamcopy. crc: move doxy to the header vf_drawtext: do not use deprecated av_tree_node_size x86: Refactor PSWAPD fallback implementations and port to cpuflags Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '381dc1a5ec0925b281c573457c413ae643567086'Michael Niedermayer2012-10-301-4/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ffmpeg: use av_rescale_delta() for audio stream copyMichael Niedermayer2012-10-271-0/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use av_rescale_delta() on the audio filter inputMichael Niedermayer2012-10-271-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: trivial simplificationMichael Niedermayer2012-10-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'Michael Niedermayer2012-10-261-3/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b891d17c531e8a63c2974aab4bf997ce70746f3': avconv: fix bitrate report when writing to /dev/null avfilter: fix graphparser memleaks on error paths rawdec: remove ff_raw_read_header pcmdec: remove dependency from rawdec g722: refactor out of rawdec.c rawvideo: use a specific read_header Conflicts: ffmpeg.c libavformat/Makefile libavformat/rawdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix null ptr deref in psnr printing codeMichael Niedermayer2012-10-251-1/+1
| | | | | | | | | | Fixes CID205005 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-241-4/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asfdec: cosmetics, reformat ff_asf_parse_packet() g.723.1: add missing CODEC_CAP_DR1 avconv: remove now unneeded calls to avcodec_get_frame_defaults(). lavc: initialize output AVFrame before decoding. Conflicts: libavformat/asfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'Michael Niedermayer2012-10-241-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80521c1997a23e148edf89e11b939ab8646297ca': build: allow targets to specify extra objects to link with executables swscale: avoid pointless use of compound literals libm: add fallbacks for various single-precision functions network: use getservbyport() only if available network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN Include sys/time.h before sys/resource.h Conflicts: Makefile configure libavutil/libm.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: check avpicture_get_size() retuen valueMichael Niedermayer2012-10-231-0/+2
| | | | | | | | | | Fixes CID205018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg/lavc: move experimental warnings to libavcodec.Michael Niedermayer2012-10-221-9/+0
| | | | | | | | | | | | This way they are available to all applications and not just ffmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'Michael Niedermayer2012-10-221-18/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4': rtpdec: Don't pass a non-AVClass pointer as log context rtsp: Update a comment to the current filename scheme avcodec: handle AVERROR_EXPERIMENTAL avutil: Add AVERROR_EXPERIMENTAL avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL Conflicts: doc/APIchanges ffmpeg.c libavcodec/utils.c libavformat/rtpdec.c libavutil/error.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Make video filter graph reinit user selectableMichael Niedermayer2012-10-171-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'Michael Niedermayer2012-10-131-7/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be': Remove libmpeg2 #define remnants De-doxygenize some top-level files Conflicts: ffmpeg.c ffmpeg.h ffmpeg_filter.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'Michael Niedermayer2012-10-101-14/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2': avconv: remove -same_quant Conflicts: Changelog doc/faq.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | fix exit_program() prototypesMichael Niedermayer2012-10-021-1/+1
| | | | | | | | | | | | This fixes 2 warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-021-29/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | ffmpeg: print muxed packet sizes in debug output tooMichael Niedermayer2012-10-021-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: disable buffering for stderr, needed for win32 runtimeThe makemkv authors2012-09-301-0/+2
| | | | | | | | | | | | | | Found in http://www.makemkv.com/download/ffmpeg/mmffmpeg-1.7.7.patch.gz Commit message by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add option to control copying of frames prior to start.Michael Niedermayer2012-09-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | Normally we discard things prior to the intended start for stream copy this is not always possible, and its not done by default this option allows discarding to be enabled this is primarely usefull when transcoding a video and stream copying an audio stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: allow printing muxer side packet timestamp debuging infoMichael Niedermayer2012-09-261-0/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud