Changeset c74b3983 in ffmpeg


Ignore:
Timestamp:
Feb 13, 2015, 10:54:38 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3e27149
Parents:
8bb489f (diff), faa8ffda (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Michael Niedermayer <michaelni@gmx.at> (02/13/15 10:51:25)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/13/15 10:54:38)
Message:

Merge commit 'faa8ffda2c513573733624784f0a7d0a4959d33e'

Conflicts:

doc/APIchanges

See: c651a1aaecb5cb7bb40cf40df27f5273e8bcd245
See: 8c8ee17e8d2800144116ec52f26a435a06b49420 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/APIchanges

    r8bb489f rc74b3983  
    1616API changes, most recent first:
    1717
    18 2015-01-xx - xxxxxxx - lavc 56.12.0, lavu 54.8.0 - avcodec.h, frame.h
     182015-01-27 - 728685f - lavc 56.12.0, lavu 54.8.0 - avcodec.h, frame.h
    1919  Add AV_PKT_DATA_AUDIO_SERVICE_TYPE and AV_FRAME_DATA_AUDIO_SERVICE_TYPE for
    2020  storing the audio service type as side data.
     
    2727  Add avdevice_list_output_sinks().
    2828
    29 2014-12-27 - d7aaeea / c220a60 - lavc 56.19.100 / 56.10.0 - vdpau.h
     292014-12-25 - d7aaeea / c220a60 - lavc 56.19.100 / 56.10.0 - vdpau.h
    3030  Add av_vdpau_get_surface_parameters().
    3131
    32 2014-12-27 - ddb9a24 / 6c99c92 - lavc 56.18.100 / 56.9.0 - avcodec.h
     322014-12-25 - ddb9a24 / 6c99c92 - lavc 56.18.100 / 56.9.0 - avcodec.h
    3333  Add AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH flag to av_vdpau_bind_context().
    3434
    35 2014-12-27 - d16079a / 57b6704 - lavc 56.17.100 / 56.8.0 - avcodec.h
     352014-12-25 - d16079a / 57b6704 - lavc 56.17.100 / 56.8.0 - avcodec.h
    3636  Add AVCodecContext.sw_pix_fmt.
    3737
     
    279279  AVCodecContext.
    280280
    281 2014-05-17 - 0eec06e - lavu 52.84.100 - time.h
     2812014-05-17 - 0eec06e / 1bd0bdc - lavu 52.84.100 / 54.5.0 - time.h
    282282  Add av_gettime_relative() av_gettime_relative_is_monotonic()
    283283
Note: See TracChangeset for help on using the changeset viewer.