Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:36:21 +0000 (11:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:36:21 +0000 (11:36 +0200)
* commit '71bf6b41d974229a06921806c333ce98566a5d8a':
  libavdevice: use avpriv_open()

Conflicts:
libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavdevice/bktr.c
libavdevice/dv1394.c
libavdevice/fbdev.c
libavdevice/oss_audio.c

index b0dbe60a2f8d296aca62f079e80f85d3d9201bd6,725d90f57971842812014a9f4fac6f2c055cad87..46d006d65f909fdab9d1a5a55890a379bc13e909
@@@ -24,7 -24,9 +24,8 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 -#include "libavformat/avformat.h"
  #include "libavformat/internal.h"
+ #include "libavutil/internal.h"
  #include "libavutil/log.h"
  #include "libavutil/opt.h"
  #include "libavutil/parseutils.h"
index 5d94f5c894dd2e5c4bdf35b98d37621101c38ab2,d259e1a14f4471938a19e31bea3277a4a92f5203..0af5ea53c7c31073cdf868ec6664f5fa8e042975
  #include <sys/ioctl.h>
  #include <sys/mman.h>
  
+ #include "libavutil/internal.h"
  #include "libavutil/log.h"
  #include "libavutil/opt.h"
 -#include "libavformat/avformat.h"
 +#include "avdevice.h"
  #include "libavformat/dv.h"
  #include "dv1394.h"
  
Simple merge
Simple merge