diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-22 14:39:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-22 14:39:12 +0200 |
commit | e3a91c51f7136c1bfd96f71b177b693e08427880 (patch) | |
tree | a9ceea95293f4622d5934672ac0004f43972833c /doc/APIchanges | |
parent | c3778df2d4c05e76d28d77a2d740e435393046c9 (diff) | |
parent | c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4 (diff) | |
download | ffmpeg-e3a91c51f7136c1bfd96f71b177b693e08427880.tar.gz |
Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'
* commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4':
rtpdec: Don't pass a non-AVClass pointer as log context
rtsp: Update a comment to the current filename scheme
avcodec: handle AVERROR_EXPERIMENTAL
avutil: Add AVERROR_EXPERIMENTAL
avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/utils.c
libavformat/rtpdec.c
libavutil/error.c
libavutil/error.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
-rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index bb9d543b92..225ca9a61c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -104,6 +104,9 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +2012-10-18 - xxxxxxx - lavu 51.45.0 - error.h + Add AVERROR_EXPERIMENTAL + 2012-10-12 - xxxxxxx - lavu 51.44.0 - pixdesc.h Add functions for accessing pixel format descriptors. Accessing the av_pix_fmt_descriptors array directly is now |