[FFmpeg-cvslog] Merge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a'

Michael Niedermayer git at videolan.org
Sun Jun 30 13:22:43 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 30 13:10:33 2013 +0200| [490ed7f0eccfeba0685ac3148ef9047fd4d92de3] | committer: Michael Niedermayer

Merge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a'

* commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a':
  wmapro: check the min_samples_per_subframe

Conflicts:
	libavcodec/wmaprodec.c

See: 9166f483c52e7e0a031a7bb149bea16aaa72f344

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

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





More information about the ffmpeg-cvslog mailing list