diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-11 14:50:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-11 15:01:45 +0200 |
| commit | f5f3684fb8d3881a6f90913417b2b5272df76e49 (patch) | |
| tree | 2cd82a73afe553baeed57683b861e6775ccebb6b /doc | |
| parent | 48d20b918c80a68e61f8bdedbf335ed4a00d6a32 (diff) | |
| parent | 885da7b08289321b88919e86d1574c8683a95a22 (diff) | |
| download | ffmpeg-f5f3684fb8d3881a6f90913417b2b5272df76e49.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: simplify is_intra_only() by using codec descriptors.
lavc: add an intra-only codec property.
lavc: add codec descriptors.
lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
dict: move struct AVDictionary definition to dict.c
dict: add av_dict_count()
Conflicts:
doc/APIchanges
libavcodec/old_codec_ids.h
libavformat/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index f1f7633c01..55b634d21d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -70,8 +70,15 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +2012-08-08 - xxxxxxx - lavu 51.38 - dict.h + Add av_dict_count(). + 2012-08-xx - xxxxxxx - lavc 54.25 - avcodec.h Rename CodecID to AVCodecID and all CODEC_ID_* to AV_CODEC_ID_*. + To provide backwards compatibility, CodecID is now #defined as AVCodecID. + Note that this can break user code that includes avcodec.h and uses the + 'CodecID' identifier. Such code should either #undef CodecID or stop using the + CodecID name. 2012-08-03 - xxxxxxx - lavu 51.37.1 - cpu.h lsws 2.1.1 - swscale.h |