diff options
Diffstat (limited to 'doc/APIchanges')
| -rw-r--r-- | doc/APIchanges | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 5818f6a8ec..b579e826c1 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,7 +13,6 @@ libavutil: 2011-04-18 API changes, most recent first: -<<<<<<< HEAD 2012-02-21 - xxxxxxx - lavc 54.4.100 Add av_get_pcm_codec() function. @@ -36,8 +35,9 @@ API changes, most recent first: 2012-01-24 - xxxxxxx - lavfi 2.60.100 Add avfilter_graph_dump. -||||||| merged common ancestors -======= +2012-xx-xx - xxxxxxx - lavc 54.3.0 - avcodec.h + Add av_packet_shrink_side_data. + 2012-xx-xx - xxxxxxx - lavf 54.2.0 - avformat.h Add AVStream.attached_pic and AV_DISPOSITION_ATTACHED_PIC, used for dealing with attached pictures/cover art. |