Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 11:06:21 +0000 (13:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 11:18:32 +0000 (13:18 +0200)
commit6e8e9f1e517ee52fe439f3e8ca762f09d235f21e
treeffd2f6414002eb7ba196046b78667b5b30676585
parentec1ed6450620f01197920f1083b285e5c8355377
parent8c02adc62d71dfbb079a04753d8c16152c49de88
Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88'

* commit '8c02adc62d71dfbb079a04753d8c16152c49de88':
  lavu: add all color-related enums to AVFrame

Conflicts:
libavcodec/avcodec.h
libavutil/frame.c
libavutil/frame.h
libavutil/version.h

The version check is changed so they are available with the current ABI
FFmpeg libs should have no problems with added fields, nor should any
application using the libs, and we regularly added fields in the past.
We also moved 2 of these fields to AVFrame already previously without issues.

See: a80e622924c89df69fb1c225ba432fe12fe6648e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavutil/frame.c
libavutil/frame.h
libavutil/pixfmt.h
libavutil/version.h