[FFmpeg-cvslog] Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 14 14:16:21 2013 +0100| [a646ac8ef5c51d6a47eb564d58d04564c0489871] | committer: Michael Niedermayer

Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'

* commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1':
  avpacket: free side data in av_free_packet().
  v4l2: do not assert on a value received from outside of Libav
  v4l2: set the average framerate instead of codec timebase.

Conflicts:
	libavcodec/avpacket.c
	libavdevice/v4l2.c

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

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