Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 19:41:41 +0000 (20:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 19:41:41 +0000 (20:41 +0100)
commit307dc32a1a7152ebacdcf9a0e58226f786ac639a
treebb770b3a3e958e762876fa395b0c7e2d114436f0
parentc4e8821732999f720535bb2eb1e8c7f1ea1db18f
parent77b2cd7b41d7ec8008b6fac753c04f77824c514c
Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'

* commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c':
  AVFrame: add side data.

Conflicts:
libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/frame.c
libavutil/frame.h