OSDN Git Service

Merge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Mar 2013 11:07:06 +0000 (12:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Mar 2013 11:08:01 +0000 (12:08 +0100)
commit6efe61486d775c42dd344a78990dfed16a9512ef
tree33ce8e05003ce9aa48b98d5f0e3d2625fe639659
parent4c1f61b1e87974f1b715d69a28429c5e1616ff17
parent1e8b9738fa70e20967ddb542d2f9d5552fc51ec6
Merge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6'

* commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6':
  avutil/frame: add all remaining frame properties to av_frame_copy_props

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