diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 11:24:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 11:24:11 +0100 |
| commit | 17ebef2fc8094a235c0f30ce247c77659ea86539 (patch) | |
| tree | e5e435fe4269c33888e1f55fc09b32e787e3479e /doc/APIchanges | |
| parent | db8403d04afc025278f611d43a91429bbfa44026 (diff) | |
| parent | 2c328a907978b61949fd20f7c991803174337855 (diff) | |
| download | ffmpeg-17ebef2fc8094a235c0f30ce247c77659ea86539.tar.gz | |
Merge commit '2c328a907978b61949fd20f7c991803174337855'
* commit '2c328a907978b61949fd20f7c991803174337855':
pixdesc: add a function for counting planes in a pixel format.
avplay: remove the -debug option.
Revert "asfenc: return error on negative timestamp"
Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
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 2bde666c35..2c1358fe05 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -144,6 +144,9 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +2013-xx-xx - lavu 52.9.0 - pixdesc.h + Add av_pix_fmt_count_planes() function for counting planes in a pixel format. + 2013-xx-xx - lavfi 3.6.0 Add AVFilterGraph.nb_filters, deprecate AVFilterGraph.filter_count. |