[FFmpeg-cvslog] Merge commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93'

Michael Niedermayer git at videolan.org
Mon Jul 29 13:01:31 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 12:53:57 2013 +0200| [5fb652dddb79feabec91002ed6f5accb6ccb633d] | committer: Michael Niedermayer

Merge commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93'

* commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93':
  oma: correctly mark and decrypt partial packets

Conflicts:
	libavformat/omadec.c

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

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





More information about the ffmpeg-cvslog mailing list