ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Tue May 
19 20:25:47 2015 +0200| [d7888ff644f5965b7a54ecefea9af1469fd1d510] | committer: 
Michael Niedermayer

Merge commit '78a3a4580c5a547af4ae8682c662ea3a4699a599' into release/2.4

* commit '78a3a4580c5a547af4ae8682c662ea3a4699a599':
  mp3: Properly use AVCodecContext API

Conflicts:
        libavformat/mp3dec.c

See: 6ad42b3e15478284321dd285acaf189a16590854
See: b851bc20c6931c084710e69f7eec30d8c1bdb68e
Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to