summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg: Don't include colorspace.hDerek Buitenhuis2013-06-291-1/+0
| | | | | | | The header is private, and ffmpeg.c doesn't use it for anything. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790'Michael Niedermayer2013-06-231-2/+8
|\ | | | | | | | | | | | | * commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790': avconv: report the error for codec open failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
* \ Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f'Michael Niedermayer2013-06-231-4/+5
|\ \ | |/ | | | | | | | | | | * commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f': avconv: drop additional strerror fallback Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'Michael Niedermayer2013-06-051-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c': avconv: check that the output format context exists before accessing it Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: ignore EOF when pushing frames to filters.Nicolas George2013-06-021-1/+5
| | | | | | | | | | | | | | EOF is not a fatal condition, it is normally produced by a few filters. TODO: take it into account to avoid useless decoding.
* | ffmpeg: use actual packet pts when discarding for the copypriorss optionJustin Ruggles2013-05-281-3/+10
| | | | | | | | | | | | | | | | | | The ist->pts value at this point does not necessarily match the actual packet pts, which is what should be used to decide whether to discard the packet. Without this change, some video packets that have pts on or after the start time are getting discarded when they should not be. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '538bf767373f176b6487e30181155e74b37cced6'Michael Niedermayer2013-05-281-8/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '538bf767373f176b6487e30181155e74b37cced6': avconv: make -aspect work with streamcopy Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: free threads on error conditions.Michael Niedermayer2013-05-151-0/+5
| | | | | | | | | | | | Fixes Ticket2562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add -apad option which injects a apad filter only in the presence of ↵Michael Niedermayer2013-05-081-0/+1
| | | | | | | | | | | | video streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use av_freep() for forced_kf_ptsMichael Niedermayer2013-05-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: drop old non monotone dts workaround.Michael Niedermayer2013-05-031-11/+0
| | | | | | | | | | | | All bugs should now be fixed in the new so the old can be droped. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: set correct log context for non monotone dts workaround warningsMichael Niedermayer2013-05-031-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: port loglevel selection code to new dts workaround codeMichael Niedermayer2013-05-031-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix pts handling in the non monotone dts workaroundMichael Niedermayer2013-05-031-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix the used maximum dts in the monotone dts workaroundMichael Niedermayer2013-05-031-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use a max variable to hold the maximum dtsMichael Niedermayer2013-05-031-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Check dts before use in non monotone dts workaroundMichael Niedermayer2013-05-031-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: limit non monotone workaround to audio & video streamsMichael Niedermayer2013-05-031-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: move non monotone prevention code downMichael Niedermayer2013-05-031-11/+11
| | | | | | | | | | | | This moves the code to after the bitstream filters Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-031-0/+19
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: avconv: do not send non-monotonous DTS to the muxers. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe'Michael Niedermayer2013-05-031-17/+11
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe': avconv: improve -re implementation Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix segfault with random outputMichael Niedermayer2013-05-021-1/+1
| | | | | | | | | | Found-by: <durandal_1707> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'Michael Niedermayer2013-05-011-5/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a': avconv: make output -ss insert trim/atrim filters. Conflicts: Changelog ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a83c0da539fb07260310bc3b34056239d2b138b2'Michael Niedermayer2013-05-011-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a83c0da539fb07260310bc3b34056239d2b138b2': avconv: make -t insert trim/atrim filters. The filter insertion code is merged but disabled as it is buggy. For example it fails in various ways when used with -s with some files. Also the trimming is arguably less accurate than the default without filters in some cases. These issues should be fixed before auto inserting the filters, until then the user can explicitly add a trim/atrim filter when one is wanted. Conflicts: Changelog ffmpeg.c ffmpeg_filter.c tests/ref/fate/bethsoft-vid tests/ref/lavf/aiff tests/ref/lavf/asf tests/ref/lavf/au tests/ref/lavf/avi tests/ref/lavf/dpx tests/ref/lavf/ffm tests/ref/lavf/gxf tests/ref/lavf/jpg tests/ref/lavf/mkv tests/ref/lavf/mmf tests/ref/lavf/mov tests/ref/lavf/mpg tests/ref/lavf/nut tests/ref/lavf/ogg tests/ref/lavf/pcx tests/ref/lavf/png tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/lavf/voc tests/ref/lavf/voc_s16 tests/ref/lavf/wav Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: make -aspect work with -vcodec copy.Nicolas George2013-04-181-1/+8
| |
* | ffmpeg: show error message in case of av_buffersrc_add_frame_flags() failureStefano Sabatini2013-04-141-4/+4
| |
* | Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'Michael Niedermayer2013-04-121-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da': lavfi: change the filter registering system to match the other libraries Conflicts: cmdutils.c ffplay.c libavfilter/avfilter.c libavfilter/avfilter.h This removes the ability to put AVFilters in read only memory and having them shareable. Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'Michael Niedermayer2013-04-111-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38f0c0781a6e099f11c0acec07f9b8be742190c4': lavfi: merge avfiltergraph.h into avfilter.h Conflicts: doc/APIchanges ffmpeg_filter.c libavfilter/avfilter.h libavfilter/avfiltergraph.h libavfilter/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: update error message, and make use of av_err2str() to simplifyStefano Sabatini2013-04-101-3/+1
| |
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-04-101-3/+3
|\ \ | | | | | | | | | | | | | | | | | | * cigaes/master: ffmpeg: use a rational for -aspect option. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffmpeg: use a rational for -aspect option.Nicolas George2013-04-091-3/+3
| | |
* | | ffmpeg: print frame decoding error statisticMichael Niedermayer2013-04-101-0/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffmpeg: dont exit 0 if fewer than 1/3 of the input could be decoded.Michael Niedermayer2013-04-101-0/+14
|/ / | | | | | | | | | | Fixes Ticket2405 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed.Carl Eugen Hoyos2013-04-041-2/+4
| | | | | | | | Tested-by: Nevcairiel
* | ffmpeg: Fix forcing of the framerate for stream copy on inputMichael Niedermayer2013-04-021-1/+6
| | | | | | | | | | | | Fixes Ticket2211 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: initialize got_output, this silences a compiler warning from iccMichael Niedermayer2013-04-011-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer2013-03-281-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-231-1/+1
| | | | | | | | | | | | | | 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-231-0/+20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with ↵Michael Niedermayer2013-03-211-46/+0
| | | | | | | | | | | | yadif injection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix freeing of sub2video frame.Nicolas George2013-03-201-1/+1
| |
* | Inform the user if a pix_fmt != yuv420p was chosen for x264 encoding.Carl Eugen Hoyos2013-03-191-0/+7
| |
* | ffmpeg: remove unused variableMichael Niedermayer2013-03-121-4/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '354468fc12dcf93e7fb4af552e18906771913273'Michael Niedermayer2013-03-121-72/+74
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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-101-5/+9
| | | | | | | | AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
* | ffmpeg: port sub2video to AVFrame.Nicolas George2013-03-101-15/+29
| | | | | | | | And re-enable the FATE test.
* | ffmpeg: do not give away our reference to the frame.Nicolas George2013-03-101-1/+2
| | | | | | | | | | Note: the logic here is temporary until the updates to ffmpeg.c are merged.
* | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-101-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-1/+6
| | | | | | | | Fixes ticket #1546 and the remaining part of ticket #1244.
View Lorry Controller Status