[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 17 16:45:11 2014 +0100| [f1edf881ef83de9f8af12fae32cb28f895ae988a] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avisynth: fix setting packet properties

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

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