[FFmpeg-cvslog] Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 20 14:39:33 2014 +0100| [fdba564585e50b69489a95b847df21779a7cd19a] | committer: Michael Niedermayer

Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'

* commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f':
  build: The MPEG-4 video parser depends on h263dsp

Conflicts:
	configure

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

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