[FFmpeg-cvslog] Merge commit '7997acee0542f6e0bb9ea42ff783f80b70878a2f' into release/1.1

Michael Niedermayer git at videolan.org
Fri Aug 8 13:28:42 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 12:48:51 2014 +0200| [244a58fff0adabcce3f9ea80d848a562ff377843] | committer: Michael Niedermayer

Merge commit '7997acee0542f6e0bb9ea42ff783f80b70878a2f' into release/1.1

* commit '7997acee0542f6e0bb9ea42ff783f80b70878a2f':
  Check if an mp3 header is using a reserved sample rate.

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

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





More information about the ffmpeg-cvslog mailing list