[FFmpeg-cvslog] Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  7 15:45:25 2012 +0100| [7c425e4f2d677477e43cd5ce0d3a5348123b8c2f] | committer: Michael Niedermayer

Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'

* commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333':
  h264: check sps.log2_max_frame_num for validity
  mov: validate number of DataReferenceBox entries against box size
  mov: compute avg_frame_rate only if duration is known
  flac: change minimum and default of lpc_passes option to 1

Conflicts:
	libavcodec/h264_ps.c
	libavformat/mov.c

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

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