[FFmpeg-cvslog] Merge commit '33f28a3be3092f642778253d9529dd66fe2a014a'

Michael Niedermayer git at videolan.org
Tue Jan 1 13:58:19 CET 2013 

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  1 13:54:12 2013 +0100| [c047a41bc5ff113bd9c7e010cf617c2589879720] | committer: Michael Niedermayer

Merge commit '33f28a3be3092f642778253d9529dd66fe2a014a'

* commit '33f28a3be3092f642778253d9529dd66fe2a014a':
  rtmp: Add a function for writing AMF strings based on two substrings
  rtmp: Return a proper error code in handle_invoke_error

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

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

More information about the ffmpeg-cvslog mailing list