summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed.Carl Eugen Hoyos2013-04-04
| | | | Tested-by: Nevcairiel
* ffmpeg: Fix forcing of the framerate for stream copy on inputMichael Niedermayer2013-04-02
| | | | | | Fixes Ticket2211 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: initialize got_output, this silences a compiler warning from iccMichael Niedermayer2013-04-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer2013-03-28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c': lavfi/gradfun: remove rounding to match C and SSE code. lavfi/gradfun: fix dithering in MMX code. lavfi/gradfun: fix rounding in MMX code. lavfi/gradfun: do not increment DC pointer for odd values. fate: filter: Add dependencies avconv: add options for reading filtergraphs from a file. Conflicts: Changelog doc/ffmpeg.texi doc/filters.texi ffmpeg.h ffmpeg_opt.c libavfilter/vf_gradfun.c tests/fate/filter.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Call do_video_stats when duplicating frameThierry Foucu2013-03-23
| | | | | | | | | | | | | | When multiple frame are encoded during vsync, current code only do_video_stats once. This need to do it every frame. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Correct inter stream timestamp discontinuitiesMichael Niedermayer2013-03-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with ↵Michael Niedermayer2013-03-21
| | | | | | | | | | | | yadif injection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix freeing of sub2video frame.Nicolas George2013-03-20
| |
* | Inform the user if a pix_fmt != yuv420p was chosen for x264 encoding.Carl Eugen Hoyos2013-03-19
| |
* | ffmpeg: remove unused variableMichael Niedermayer2013-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '354468fc12dcf93e7fb4af552e18906771913273'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '354468fc12dcf93e7fb4af552e18906771913273': avplay: switch to new refcounted frames API avconv: convert to new refcounted AVFrame API Conflicts: cmdutils.c ffmpeg.c ffmpeg.h ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: re-enable use of buffersrc flags.Nicolas George2013-03-10
| | | | | | | | AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
* | ffmpeg: port sub2video to AVFrame.Nicolas George2013-03-10
| | | | | | | | And re-enable the FATE test.
* | ffmpeg: do not give away our reference to the frame.Nicolas George2013-03-10
| | | | | | | | | | Note: the logic here is temporary until the updates to ffmpeg.c are merged.
* | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e350379f87e7f74420b4813170fe808e2313911': lavfi: switch to AVFrame. Conflicts: doc/filters.texi libavfilter/af_ashowinfo.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.c libavfilter/buffersrc.c libavfilter/buffersrc.h libavfilter/f_select.c libavfilter/f_setpts.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/version.h libavfilter/vf_aspect.c libavfilter/vf_bbox.c libavfilter/vf_blackframe.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hqdn3d.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavfilter/yadif.h Following are notes about the merge authorship and various technical details. Michael Niedermayer: * Main merge operation, notably avfilter.c and video.c * Switch to AVFrame: - afade - anullsrc - apad - aresample - blackframe - deshake - idet - il - mandelbrot - mptestsrc - noise - setfield - smartblur - tinterlace * various merge changes and fixes in: - ashowinfo - blackdetect - field - fps - select - testsrc - yadif Nicolas George: * Switch to AVFrame: - make rawdec work with refcounted frames. Adapted from commit 759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov. Also, fix the use of || instead of | in a flags check. - make buffer sink and src, audio and video work all together Clément Bœsch: * Switch to AVFrame: - aevalsrc - alphaextract - blend - cellauto - colormatrix - concat - earwax - ebur128 - edgedetect - geq - histeq - histogram - hue - kerndeint - life - movie - mp (with the help of Michael) - overlay - pad - pan - pp - pp - removelogo - sendcmd - showspectrum - showwaves - silencedetect - stereo3d - subtitles - super2xsai - swapuv - thumbnail - tile Hendrik Leppkes: * Switch to AVFrame: - aconvert - amerge - asetnsamples - atempo - biquads Matthieu Bouron: * Switch to AVFrame - alphamerge - decimate - volumedetect Stefano Sabatini: * Switch to AVFrame: - astreamsync - flite - framestep Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Close output codecs if input codec initialisation fails.Carl Eugen Hoyos2013-03-08
| | | | | | | | Fixes ticket #1546 and the remaining part of ticket #1244.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: Deprecate the deinterlace functions in libavcodec h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band Conflicts: configure ffmpeg_opt.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/imgconvert.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Deprecate deinterlaced in libavcodec.Ronald S. Bultje2013-03-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix -stats -v 0Michael Niedermayer2013-03-03
| | | | | | | | | | | | Fixes Ticket1687 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: print maxrss "-benchmark" data even on errorsMichael Niedermayer2013-03-02
| | | | | | | | | | | | Fixes Ticket2297 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'Michael Niedermayer2013-03-01
|\| | | | | | | | | | | | | * commit 'df0229a7caa124dcfb84c34b48d316744c467311': avconv: Apply codec options to streams that are copied as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix variable name in psnr printing codeMichael Niedermayer2013-03-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: free last sub when using -fix_sub_duration.Nicolas George2013-02-27
| | | | | | | | | | | | | | | | Fix trac ticket #2242. Note: under valid circumstances, when using -fix_sub_duration, the last subtitle is a dummy termination packet, with no allocated memory.
* | ffmpeg: use a AVDictionary instead of the context to move swr parameters aroundMichael Niedermayer2013-02-24
| | | | | | | | | | | | | | This avoids per parameter changes in ffmpeg at the cost of making access somewhat more annoying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'Michael Niedermayer2013-02-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c7db097ebe1fb5c233cedd8846615074e7d6044': avconv: pass libavresample options to AVFilterGraph Conflicts: cmdutils.c cmdutils.h ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Check for parameter changes at the output of the audio filter graphMichael Niedermayer2013-02-14
| | | | | | | | | | | | | | | | | | | | | | It is currently possible that such changes leak through from the decoder as well as a filter could generate such changes itself. This commit blocks such changed packets unless the encoder declares support. Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix streamcopy of lsf mp3.Michael Niedermayer2013-02-12
| | | | | | | | | | Fixes streamcopy of bear_mpeg4_mp3.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: do not call exit from exit_program()Michael Niedermayer2013-02-06
| | | | | | | | | | | | This should fix Ticket2116 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: implement -force_key_frames expression evalutionStefano Sabatini2013-01-27
| |
* | ffmpeg: support filtering of unknown channel layouts.Nicolas George2013-01-26
| |
* | ffmpeg: add -guess_layout_max option.Nicolas George2013-01-26
| |
* | ffmpeg: copy tmcd track timebase parametersMichael Niedermayer2013-01-24
| | | | | | | | | | | | Fixes part of Ticket2045 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd9bf716945046333c24580d538f450b516f15710'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | * 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-19
| | | | | | | | 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-17
| | | | | | | | Fixes ticket #1953.
* | add note on windows piperogerdpack2013-01-06
| | | | | | | | | | 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-27
| | | | | | | | bitrate
* | Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer2012-12-20
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-19
| | | | | | | | | | | | | | 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-16
| |
* | ffmpeg: sub2video: use start and end time.Nicolas George2012-12-12
| | | | | | | | | | | | | | 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-04
| |
* | ffmpeg: use the correct variables in do_video_stats()Michael Niedermayer2012-12-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Update video stats log during encode flushThierry Foucu2012-12-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix mixed declarations and statements.Michael Niedermayer2012-11-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Correct starttime based on non discarded streams.Michael Niedermayer2012-11-24
| | | | | | | | | | | | Fixes Ticket1830 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: minor simplification of wraping codeMichael Niedermayer2012-11-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add setting of field_order flagTim Nicholson2012-11-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix weird reindentStefano Sabatini2012-11-22
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 17:36:11 +0000