Reinhard Tartler
7ffe76e540
Merge libavcore into libavutil
...
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Mans Rullgard
952f231588
Remove incorrect return statement from avcodec_thread_free()
...
The function return type is void, so a return statement with an
expression is forbidden (and pointless).
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit b4668274b9
)
2011-02-11 02:54:09 +01:00
Mans Rullgard
ee5bb31f99
Fix build with threading disabled
...
The avcodec_thread_free() compatibility wrapper calls ff_thread_free(),
which is not defined when threading is disabled. Make this call
conditional.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 9a77a92c2b
)
2011-02-11 02:54:08 +01:00
Reimar Döffinger
7ade06cc2e
check sample_fmt in avcodec_open
...
check AVCodecContext->sample_fmt against AVCodec->sample_fmts[] to ensure
that the encoder supports the specified sample format. Error out if it doesn't.
Previously, it would continue and output garbage. Fixes issue 2587.
(cherry picked from commit 2cfa2d9258
)
2011-02-11 02:54:08 +01:00
Alexander Strange
043d2ff267
Deprecate avcodec_thread_init()
...
As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.
avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.
Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c0b102ca03
)
2011-02-11 02:54:08 +01:00
Alexander Strange
b38f008ea6
Frame-based multithreading framework using pthreads
...
See doc/multithreading.txt for details on use in codecs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-11 02:53:58 +01:00
Nicolas George
76ad67cae7
Implement guessed_pts in avcodec_decode_video2
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-07 19:32:07 +01:00
Nicolas George
cf96cce728
Set pkt_pts in avcodec_default_reget_buffer()
...
This was missed when pkt_pts was first added.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 62ecd3635a
)
2011-02-04 03:10:10 +01:00
Diego Elio Pettenò
291f326a2e
Make the ff_lockmgr_cb function pointer static to utils.c
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit bb875b75ba
)
2011-01-26 03:43:29 +01:00
Janne Grunau
db323491cd
update av_log_missing_feature() to git
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-17 22:13:50 +01:00
Aurelien Jacobs
e83c716e16
don't complain about codec type/id mismatche for attachment streams
...
Originally committed as revision 26316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-12 00:33:22 +00:00
Anssi Hannula
2a81f4bde5
Show profile in avcodec_string().
...
Patch by Anssi Hannula, anssi d hannula a iki d fi
Originally committed as revision 26264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-08 09:23:25 +00:00
Michael Niedermayer
1919feafb1
Add pkt_dts to AVFrame, this will in the future allow multithreading decoders
...
to not mess up dts
Originally committed as revision 26261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-07 23:07:28 +00:00
Michael Niedermayer
393cbb963b
Add AVFrame.pkt_pts that contains the correctly reordered AVPacket.pts
...
Originally committed as revision 26260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-07 23:07:24 +00:00
Anssi Hannula
060ec0a829
Add av_get_profile_name() to get profile names.
...
Patch by Anssi Hannula, anssi d hannula a iki d fi
Originally committed as revision 26259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-07 22:27:26 +00:00
Aurelien Jacobs
f19c58b4cf
free subtitle_header before overwriting it to avoid memleak
...
Originally committed as revision 26176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-31 00:06:25 +00:00
Anatoly Nenashev
ba68d9d3e1
Fix -lowres with ffplay.
...
Patch by Anatoly Nenashev, anatoly d nenashev a ovsoft d ru
Originally committed as revision 26057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-19 12:17:40 +00:00
Michael Niedermayer
372c3f82b7
Change the argument of memory allocation functions from unsigned int to size_t
...
with the next major bump in libavcodec.
Originally committed as revision 25872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04 04:00:21 +00:00
Stefano Sabatini
63e8d9760f
Use the new libavcore audio channel API.
...
This also allows to remove a linking dependency of libavfilter on
libavcodec.
Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 20:06:22 +00:00
Stefano Sabatini
5d6e4c160a
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
...
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 11:04:40 +00:00
Stefano Sabatini
ed5d30d91c
Move internal function ff_set_systematic_pal() to libavcore, and
...
rename it ff_set_systematic_pal2().
Originally committed as revision 25712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-09 22:22:36 +00:00
Reimar Döffinger
00d1e96bf4
H.264 decode: support cropping up to 28 pixels in interlaced mode.
...
Contrary to progressive, just being able to crop up to 14/15 pixels
is not enough to encode all supported resolutions, and the new
behaviour is also consistent with e.g. MPEG-2 etc.
Originally committed as revision 25669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-03 20:52:28 +00:00
Stefano Sabatini
ba7d6e798e
Remove usage of deprecated libavcodec/audioconvert.h functions.
...
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-03 20:19:34 +00:00
Stefano Sabatini
6f84cd1279
Add av_get_bits_per_sample_fmt() to libavcore/samplefmt.h and
...
deprecate av_get_bits_per_sample_format().
Originally committed as revision 25654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-02 22:20:49 +00:00
Aurelien Jacobs
448ce9258c
add FF_API_SUBTITLE_OLD define to disable the deprecated decode_subtitle API
...
Originally committed as revision 25273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-30 20:12:46 +00:00
Aurelien Jacobs
164bc38c26
add FF_API_VIDEO_OLD define to disable the deprecated decode_video API
...
Originally committed as revision 25272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-30 19:51:22 +00:00
Aurelien Jacobs
a377cfa6c2
add FF_API_AUDIO_OLD define to disable the deprecated decode_audio API
...
Originally committed as revision 25270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-30 15:37:01 +00:00
Michael Niedermayer
dc51a72ba4
Move allocation and init to defaults of the private codec contexts to avcodec_get_context_defaults3().
...
That way the user app can set codec specific parameters in the private context
before opening it.
Originally committed as revision 25257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 15:05:47 +00:00
Michael Niedermayer
6ed040408b
Move AVOptions from libavcodec to libavutil
...
Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 14:25:22 +00:00
Reimar Döffinger
82eac2f321
Check avctx width/height more thoroughly (e.g. all values 0 except width would
...
have been accepted before).
Also do not fail if they are invalid but instead override them to 0.
This allows decoding e.g. MPEG video when only the container values are corrupted.
For encoding a value of 0,0 of course makes no sense, but was allowed
through before and will be caught by an extra check in the encode function.
Originally committed as revision 25124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 04:46:55 +00:00
Carl Eugen Hoyos
527c91e34a
Test lowres before codec init.
...
Originally committed as revision 25114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-13 22:03:29 +00:00
Martin Storsjö
535cb0434d
Allow the lowres option to affect audio codecs, too
...
Originally committed as revision 25094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-10 06:19:31 +00:00
Stefano Sabatini
9d2e0ad824
Remove use of deprecated functions av_image_fill_pointers/linesizes in
...
libavcodec/utils.c, fix warnings.
Originally committed as revision 25069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 21:24:03 +00:00
Stefano Sabatini
e16f217ceb
Use new imgutils.h API names, fix deprecation warnings.
...
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 19:15:29 +00:00
Stefano Sabatini
6ce9b4310c
Remove use of the deprecated function avcodec_check_dimensions(), use
...
av_check_image_size() instead.
Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 09:37:04 +00:00
Stefano Sabatini
bf176f58b7
Deprecate avcodec_check_dimensions() in favor of the new function
...
av_check_image_size() declared in libavcore/imgutils.h.
Originally committed as revision 24709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 09:36:45 +00:00
Stefano Sabatini
05236ed735
Use av_fill_image_pointers/linesizes in place of ff_fill_pointer/linesize,
...
and drop the the ff_ variants at the next major bump.
Originally committed as revision 24620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-31 16:46:20 +00:00
Stefano Sabatini
126b638ea0
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
...
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.
This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.
Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:12:28 +00:00
Reimar Döffinger
8b834ac5d9
100l, change avsubtitle_free to the actually tested and working version.
...
Originally committed as revision 24188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 07:53:39 +00:00
Reimar Döffinger
e1d7c8831c
Add avsubtitle_free function.
...
Originally committed as revision 24185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 07:35:00 +00:00
Carl Eugen Hoyos
0fd0ef7947
Add new decoder property max_lowres and do not init decoder if requested value is higher.
...
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 21:23:36 +00:00
Måns Rullgård
25cbc8b46e
Move av_tempfile() to libxvidff.c as only the xvid wrapper needs it
...
Originally committed as revision 24074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-06 13:04:21 +00:00
Måns Rullgård
49bd8e4b84
Fix grammar errors in documentation
...
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
Stefano Sabatini
ab0b53786b
Make avcodec_string() use av_get_codec_tag_string().
...
Originally committed as revision 23422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-02 10:54:50 +00:00
Stefano Sabatini
7e566bbe6c
Implement av_get_codec_tag_string() and use it in ffprobe.
...
Originally committed as revision 23421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-02 10:54:45 +00:00
Jai Menon
3491a9b266
Cosmetics : Fix typo.
...
Originally committed as revision 23345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-27 04:25:50 +00:00
Janne Grunau
93ebfeea90
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
...
Patch by Janne Grunau, janne-ffmpeg jannau net
Originally committed as revision 23334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 10:38:48 +00:00
Francesco Lavra
603a5f04b2
Factorize some code into the new function ff_toupper4().
...
Patch by Francesco Lavra, francescolavra interfree it
Originally committed as revision 23158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:16:40 +00:00
Reimar Döffinger
b3ab319944
Set coded_frame to NULL when closing a codec, since it might
...
be invalid after the codec is "gone".
Originally committed as revision 23101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-12 17:05:56 +00:00
Stefano Sabatini
4cf1ba0445
Make avcodec_check_dimensions() return AVERROR(EINVAL) rather than -1
...
in case of invalid picture size.
Originally committed as revision 22962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 15:05:16 +00:00