generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
54,353 Commits 24 Branches 241 Tags 173 MiB
a478e99a60
Commit Graph

1954 Commits

Author SHA1 Message Date
Derek Buitenhuis
58950ca0df ffmpeg: Don't include colorspace.h 
The header is private, and ffmpeg.c doesn't use it
for anything.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-29 16:44:12 -04:00
Michael Niedermayer
cc61ef0479 Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790' 
* commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790':
  avconv: report the error for codec open failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 12:56:55 +02:00
Michael Niedermayer
d894e64acc Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f' 
* commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f':
  avconv: drop additional strerror fallback

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 12:56:05 +02:00
Michael Niedermayer
4abd5a4318 Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c' 
* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c':
  avconv: check that the output format context exists before accessing it

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 12:20:26 +02:00
Nicolas George
fc82f4a1f8 ffmpeg: ignore EOF when pushing frames to filters. 
EOF is not a fatal condition, it is normally produced
by a few filters.

TODO: take it into account to avoid useless decoding.
 2013-06-02 23:19:42 +02:00
Justin Ruggles
e816a8bc26 ffmpeg: use actual packet pts when discarding for the copypriorss option 
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>
 2013-05-28 17:03:23 -04:00
Michael Niedermayer
2ad28840b3 Merge commit '538bf767373f176b6487e30181155e74b37cced6' 
* commit '538bf767373f176b6487e30181155e74b37cced6':
  avconv: make -aspect work with streamcopy

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 08:52:03 +02:00
Michael Niedermayer
1a36c756d8 ffmpeg: free threads on error conditions. 
Fixes Ticket2562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 01:28:59 +02:00
Michael Niedermayer
33ff943f70 ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 23:55:06 +02:00
Michael Niedermayer
410905f7fd ffmpeg: use av_freep() for forced_kf_pts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 23:55:06 +02:00
Michael Niedermayer
0966623604 ffmpeg: drop old non monotone dts workaround. 
All bugs should now be fixed in the new so the old can be droped.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 15:04:47 +02:00
Michael Niedermayer
af2d964336 ffmpeg: set correct log context for non monotone dts workaround warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 15:03:35 +02:00
Michael Niedermayer
b2a1d92b7b ffmpeg: port loglevel selection code to new dts workaround code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 15:02:43 +02:00
Michael Niedermayer
30c05f6b02 ffmpeg: fix pts handling in the non monotone dts workaround 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 15:00:21 +02:00
Michael Niedermayer
007ee09d7c ffmpeg: fix the used maximum dts in the monotone dts workaround 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:58:28 +02:00
Michael Niedermayer
26b89f6274 ffmpeg: use a max variable to hold the maximum dts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:57:05 +02:00
Michael Niedermayer
6b2fbdb047 ffmpeg: Check dts before use in non monotone dts workaround 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:55:20 +02:00
Michael Niedermayer
ee3824f6f6 ffmpeg: limit non monotone workaround to audio & video streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:55:12 +02:00
Michael Niedermayer
9fe2a62cc4 ffmpeg: move non monotone prevention code down 
This moves the code to after the bitstream filters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:52:37 +02:00
Michael Niedermayer
2b7f595aca Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: do not send non-monotonous DTS to the muxers.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 14:52:03 +02:00
Michael Niedermayer
22dc25cb29 Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe' 
* commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe':
  avconv: improve -re implementation

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 13:53:08 +02:00
Michael Niedermayer
49ec4c7e49 ffmpeg: fix segfault with random output 
Found-by: <durandal_1707>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-02 16:01:28 +02:00
Michael Niedermayer
4818388e6c Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a' 
* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a':
  avconv: make output -ss insert trim/atrim filters.

Conflicts:
	Changelog
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 17:24:43 +02:00
Michael Niedermayer
76c1f9200f Merge commit 'a83c0da539fb07260310bc3b34056239d2b138b2' 
* 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>
 2013-05-01 14:23:52 +02:00
Nicolas George
b1cc12d0e3 ffmpeg: make -aspect work with -vcodec copy. 2013-04-18 22:59:54 +02:00
Stefano Sabatini
f6c9a325b7 ffmpeg: show error message in case of av_buffersrc_add_frame_flags() failure 2013-04-14 20:30:37 +02:00
Michael Niedermayer
835cc0f2e7 Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da' 
* 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>
 2013-04-12 15:08:40 +02:00
Michael Niedermayer
231fd4411f Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 
* 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>
 2013-04-11 23:50:39 +02:00
Stefano Sabatini
270217908b ffmpeg: update error message, and make use of av_err2str() to simplify 2013-04-10 18:02:00 +02:00
Michael Niedermayer
f1c0c6b7de Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  ffmpeg: use a rational for -aspect option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-10 01:49:39 +02:00
Michael Niedermayer
6a78ec180e ffmpeg: print frame decoding error statistic 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-10 01:47:03 +02:00
Michael Niedermayer
eedcac68f3 ffmpeg: dont exit 0 if fewer than 1/3 of the input could be decoded. 
Fixes Ticket2405

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-10 01:40:06 +02:00
Nicolas George
de38e7c8c3 ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
Carl Eugen Hoyos
1c0d8f2563 Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed. 
Tested-by: Nevcairiel
 2013-04-04 00:01:34 +02:00
Michael Niedermayer
356363c898 ffmpeg: Fix forcing of the framerate for stream copy on input 
Fixes Ticket2211

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-02 18:19:23 +02:00
Michael Niedermayer
f7a02d5d69 ffmpeg: initialize got_output, this silences a compiler warning from icc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 20:47:48 +02:00
Michael Niedermayer
ac1a1fd708 Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c' 
* 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>
 2013-03-28 13:00:39 +01:00
Thierry Foucu
fcf73f9c01 Call do_video_stats when duplicating frame 
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>
 2013-03-23 12:29:12 +01:00
Michael Niedermayer
4c1f61b1e8 ffmpeg: Correct inter stream timestamp discontinuities 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-23 04:53:44 +01:00
Michael Niedermayer
4257b804e2 ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-21 13:54:04 +01:00
Nicolas George
6a90f6d789 ffmpeg: fix freeing of sub2video frame. 2013-03-20 21:13:55 +01:00
Carl Eugen Hoyos
e4f5aa5e8d Inform the user if a pix_fmt != yuv420p was chosen for x264 encoding. 2013-03-19 01:16:37 +01:00
Michael Niedermayer
b1a9a2c4ff ffmpeg: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 18:58:10 +01:00
Michael Niedermayer
32fdfdfbda Merge commit '354468fc12dcf93e7fb4af552e18906771913273' 
* 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>
 2013-03-12 14:16:02 +01:00
Nicolas George
fb14e37dd0 ffmpeg: re-enable use of buffersrc flags. 
AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
 2013-03-10 14:07:29 +01:00
Nicolas George
f9b34b8bf9 ffmpeg: port sub2video to AVFrame. 
And re-enable the FATE test.
 2013-03-10 13:45:15 +01:00
Nicolas George
4e7c61b7a7 ffmpeg: do not give away our reference to the frame. 
Note: the logic here is temporary until the updates to
ffmpeg.c are merged.
 2013-03-10 01:41:50 +01:00
Michael Niedermayer
a05a44e205 Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 
* 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
      759001c534 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>
 2013-03-10 01:40:35 +01:00
Michael Niedermayer
2653e12520 Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 
* 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>
 2013-03-08 19:12:03 +01:00
Carl Eugen Hoyos
199db97fbd Close output codecs if input codec initialisation fails. 
Fixes ticket #1546 and the remaining part of ticket #1244.
 2013-03-08 02:46:46 +01:00