[FFmpeg-cvslog] Merge commit '2fcef90bee98bffeff1d95b7197738f50c450d86'

Michael Niedermayer git at videolan.org
Tue Apr 29 00:46:48 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 29 00:37:51 2014 +0200| [2548f8a237b1ef85d1b56a897e93d5af206e4654] | committer: Michael Niedermayer

Merge commit '2fcef90bee98bffeff1d95b7197738f50c450d86'

* commit '2fcef90bee98bffeff1d95b7197738f50c450d86':
  dxva2_h264: set the correct ref frame index in the long slice struct

Conflicts:
	libavcodec/dxva2_h264.c

See: 276839b8de7ff836a529bbd6221f615a343b23e1
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2548f8a237b1ef85d1b56a897e93d5af206e4654
---





More information about the ffmpeg-cvslog mailing list