generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73,836 Commits 24 Branches 241 Tags
Commit Graph

5462 Commits

Author SHA1 Message Date
Michael Niedermayer
c6a596f626 doc/APIchanges: Correct function reference. 
The commit bb789016d423d2cfacd2904ac66257bdf7f0964e
un-deprecated sws_getContext()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 21:00:46 +02:00
Michael Niedermayer
4917fecf4a Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e' 
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
  swscale: Undeprecate sws_getContext()

Conflicts:
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 20:52:40 +02:00
Michael Niedermayer
a561662fb7 Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d' 
* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
  avcodec: Undeprecate reordered_opaque

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 20:43:11 +02:00
Diego Biurrun
bb789016d4 swscale: Undeprecate sws_getContext() 
sws_getCachedContext is not a full replacement for the function.
 2014-08-07 04:03:00 -07:00
Diego Biurrun
ad1ee5fa75 avcodec: Undeprecate reordered_opaque 
It allows attaching other external, opaque data to the frame and passing it
through the reordering process, for cases when the caller wants other data
than just the plain packet pts.  There is no way to cleanly achieve this
without the field.
 2014-08-07 04:03:00 -07:00
Timothy Gu
9f02a2b224 transcode_aac: fix const return value 
Fixes Trac #3613.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-06 04:01:19 +02:00
Michael Niedermayer
a32e306be3 doc/muxers: document which applications are known to need disable_chpl. 
Thanks to: John Stebbins <stebbins@jetheaddev.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-06 03:59:37 +02:00
Clément Bœsch
28a2107a8d avutil: add pixelutils API 2014-08-05 21:05:52 +02:00
mrskman
6f3e15af84 avfilter/avf_showwaves: New p2p mode for showwaves filter 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 14:12:35 +02:00
Michael Niedermayer
a53a107a2f Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c' 
* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c':
  movenc: Add option to disable nero chapters

Conflicts:
	doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 13:58:10 +02:00
John Stebbins
0897d2fdc7 movenc: Add option to disable nero chapters 
And add flag to muxer documentation.
Nero chapters break some taggers (mp3tag and iTunes).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-08-05 11:36:08 +02:00
Michael Niedermayer
6017c98036 Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6' 
* commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6':
  avutil: add AV_PIX_FMT_YA16 pixel format

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 22:12:24 +02:00
Michael Niedermayer
4c8bc6fdee Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5' 
* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5':
  avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/raw.c
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 21:48:00 +02:00
Michael Niedermayer
073c074447 Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26' 
* commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26':
  pixdesc: Support pixelformat aliases

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 21:32:03 +02:00
Michael Niedermayer
491c52d3b0 Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' 
* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc':
  Add Icecast protocol

Conflicts:
	Changelog
	configure
	doc/protocols.texi
	libavformat/icecast.c
	libavformat/version.h

See: e3dc2c86fc4178b100484c54f12c88705cdf6724
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 14:14:13 +02:00
Vittorio Giovara
e9abafca27 avutil: add AV_PIX_FMT_YA16 pixel format 2014-08-04 12:55:08 +01:00
Vittorio Giovara
e96c3b81ca avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 
The rationale is that you have a packed format in form
<greyscale sample> <alpha sample> <greyscale sample> <alpha sample>
and shortening greyscale to 'G' might make one thing about Greenscale instead.
An alias pixel format and color space name are provided for compatibility.
 2014-08-04 12:55:08 +01:00
Luca Barbato
d2962e9f89 pixdesc: Support pixelformat aliases 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-08-04 12:55:07 +01:00
ePirat
e3dc2c86fc libavformat: Add Icecast protocol 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 13:33:44 +02:00
Marvin Scholz
eb9244f202 Add Icecast protocol 
Icecast is basically a convenience wrapper around the HTTP protocol.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-08-04 12:56:42 +03:00
Michael Niedermayer
71d008ebe4 Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a' 
* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
  avcodec: Deprecate dtg_active_format field in favor of avframe side-data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/mpeg12dec.c
	libavcodec/version.h
	libavfilter/vf_showinfo.c
	libavutil/frame.h
	libavutil/version.h

See: 2a3c36e920d958e99fb4edf065a6713c30f2c2a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 06:11:34 +02:00
Kieran Kunhya
2a3c36e920 Deprecate AFD field and add AFD as side-data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 05:36:44 +02:00
Kieran Kunhya
1ef9e83764 avcodec: Deprecate dtg_active_format field in favor of avframe side-data 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-03 15:43:02 -07:00
Michael Niedermayer
e680c731a2 avcodec/avdct: Add get_pixels() 
Suggested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-03 23:34:35 +02:00
Michael Niedermayer
9400603140 Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8' 
* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
  avcodec: Deprecate unused defines and options

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-03 20:53:00 +02:00
Michael Niedermayer
f1d6fc7794 Merge commit '6a928293dd29c7f0dcf09107980a1d651c9957df' 
* commit '6a928293dd29c7f0dcf09107980a1d651c9957df':
  examples: filter_audio: Add missing mem.h header for av_freep()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-03 19:18:25 +02:00
Diego Biurrun
9f17685dfb avcodec: Deprecate unused defines and options 2014-08-03 03:24:16 -07:00
Stefano Sabatini
ac1e3882cc doc/ffserver: merge paragraph starting with "What happens next?" with previous one 
The name of the paragraph sounded a bit silly, and its text is small so
it's better to merge it with the previous paragraph.
 2014-08-03 11:27:27 +02:00
Diego Biurrun
6a928293dd examples: filter_audio: Add missing mem.h header for av_freep() 2014-08-03 01:29:43 -07:00
Michael Niedermayer
c87f645a75 Merge commit '52269f48e835a52023656f8330262ae70e6061c4' 
* commit '52269f48e835a52023656f8330262ae70e6061c4':
  Revert "vf_interlace: deprecate lowpass option"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 16:39:28 +02:00
Vittorio Giovara
52269f48e8 Revert "vf_interlace: deprecate lowpass option" 
This reverts commit 35b05c5184fb3aa1191e2d1e7f1cae1e11f344a4.
A warning is introduced in case this option is used.
 2014-08-01 13:02:29 +01:00
Carl Eugen Hoyos
970c7d9b69 Add forgotten APIchanges entry for probesize2. 
Update some git hashes.
 2014-08-01 12:49:56 +02:00
Lou Logan
d76675d9c0 doc/indevs: mention required configure options 
For x11grab, libcdio, and libdc1394 input devices.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-07-31 15:00:41 -08:00
Gerion Entrup
dc315cdb4e doc: add very basic libcdio documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 02:54:17 +02:00
Michael Niedermayer
547d64a49a ffprobe: print some basic information about avframe side data 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 19:23:08 +02:00
Michael Niedermayer
ba3e3311ef avutil/frame: add av_frame_side_data_name() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 19:19:22 +02:00
Michael Niedermayer
31e0b5d3cb Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6' 
* commit '69e7336b8e16ee65226fc20381baf537f4b125e6':
  avstring: Expose the simple name match function

Conflicts:
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 20:24:42 +02:00
Luca Barbato
69e7336b8e avstring: Expose the simple name match function 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-07-29 17:46:29 +02:00
Michael Niedermayer
2e5c8b0649 Merge commit 'c5fca0174db9ed45be821177f49bd9633152704d' 
* commit 'c5fca0174db9ed45be821177f49bd9633152704d':
  lavc: add a property for marking codecs that support frame reordering

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 12:36:28 +02:00
Anton Khirnov
c5fca0174d lavc: add a property for marking codecs that support frame reordering 2014-07-28 08:02:50 +00:00
Lou Logan
db0578a0e7 doc/decoders: mention native Opus decoder 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-07-27 13:46:48 -08:00
Michael Niedermayer
f285056810 doc/examples/muxing: fix "-flags" option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 19:58:47 +02:00
Michael Niedermayer
932ff70956 avcodec: add avdct 
This provides a public sustainable API/ABI for DCT functions.
Only externally used dct functions are included.
The structure is extensible without ABI issues compared to the
existing dct contexts.

See Mailing list and IRC log of 2014-07-26/27

Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 17:21:40 +02:00
Michael Niedermayer
c437765be7 doc/examples/muxing: Exchange tmp_frame and frame 
Reduces difference to 56f98e340fca894a76d1ddbe33118b8d8c4db34a

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 12:03:51 +02:00
Michael Niedermayer
d1ce43a3e8 doc/examples/muxing: mark correct frame as writeable 
Bug found from comparing 56f98e340fca894a76d1ddbe33118b8d8c4db34a to HEAD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 01:55:17 +02:00
Michael Niedermayer
fbd46e2f1c doc/examples/muxing: Always use swr, simplifies code slightly 
Idea-from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 01:32:19 +02:00
Anton Khirnov
22e9fe06eb doc/examples/muxing: add alloc_audio_frame() and use it to simplify code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 01:15:39 +02:00
Michael Niedermayer
a98cadef7f doc/examples/muxing: Move samples_count to OutputStream 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 01:05:05 +02:00
Michael Niedermayer
8b1d54ba40 doc/examples/muxing: free swr context at the end 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-27 00:50:58 +02:00
Michael Niedermayer
7cf0865551 doc/examples/muxing: Support setting flags, for example for setting bitexact 
This would allow the example to be used in regression tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-26 22:49:02 +02:00