eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
c3624cfe7638e41891cebf08c3381036adc8a9cd
ffmpeg/libavcodec/dxva2_mpeg2.c
Michael Niedermayer fee484edaf Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327' 
* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
  lavc: move AVFrame.hwaccel_picture_private to Picture.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 19:35:37 +01:00

11 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink