Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 13:16:21 +0000 (14:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 13:16:21 +0000 (14:16 +0100)
commita646ac8ef5c51d6a47eb564d58d04564c0489871
tree7a9365c0d598a40815932f254a16d38eb3a13646
parent53c2f401f726732e56343377452e487c8c6a0ee1
parent90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1
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@gmx.at>
libavcodec/avpacket.c
libavdevice/v4l2.c