OSDN Git Service

Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:34:43 +0000 (04:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:34:46 +0000 (04:34 +0100)
commit7f18cb9101e4e1921fd0a5cfe72fbdb69ac9bf8a
tree493c4acd408ee2f0847e23ec06fc2b9bf7998ac8
parent4c55aa8f93c61b33d44b8d23e20ae78a72249bf6
parent513d849bb605d3d862da1ada709bd2ca1ac68f58
Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'

* commit '513d849bb605d3d862da1ada709bd2ca1ac68f58':
  mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.h
libavcodec/vaapi_mpeg4.c