[FFmpeg-cvslog] Merge commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 18 19:43:20 2014 +0100| [ae9b468b08bd561ba13292933a65c000b94c3a3b] | committer: Michael Niedermayer

Merge commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07'

* commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07':
  lavc: er: remove unused variable size

No change as the variable is used

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

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